cisco-perfmon 1.1.2 → 1.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/main.js +56 -28
- package/package.json +1 -1
package/main.js
CHANGED
|
@@ -155,9 +155,17 @@ class perfMonService {
|
|
|
155
155
|
let arr = item.Name.split("\\").filter(
|
|
156
156
|
(element) => element
|
|
157
157
|
);
|
|
158
|
+
|
|
159
|
+
let instanceArr = arr[1]
|
|
160
|
+
.split(/[()]+/)
|
|
161
|
+
.filter(function (e) {
|
|
162
|
+
return e;
|
|
163
|
+
});
|
|
164
|
+
|
|
158
165
|
return {
|
|
159
166
|
host: arr[0],
|
|
160
|
-
object:
|
|
167
|
+
object: instanceArr[0],
|
|
168
|
+
instance: instanceArr[1] ? instanceArr[1] : "",
|
|
161
169
|
counter: arr[2],
|
|
162
170
|
value: item.Value,
|
|
163
171
|
cstatus: item.CStatus,
|
|
@@ -167,9 +175,15 @@ class perfMonService {
|
|
|
167
175
|
let arr = returnResults.Name.split("\\").filter(
|
|
168
176
|
(element) => element
|
|
169
177
|
);
|
|
178
|
+
|
|
179
|
+
let instanceArr = arr[1].split(/[()]+/).filter(function (e) {
|
|
180
|
+
return e;
|
|
181
|
+
});
|
|
182
|
+
|
|
170
183
|
newOutput = {
|
|
171
184
|
host: arr[0],
|
|
172
|
-
object:
|
|
185
|
+
object: instanceArr[0],
|
|
186
|
+
instance: instanceArr[1] ? instanceArr[1] : "",
|
|
173
187
|
counter: arr[2],
|
|
174
188
|
value: returnResults.Value,
|
|
175
189
|
cstatus: returnResults.CStatus,
|
|
@@ -245,9 +259,17 @@ class perfMonService {
|
|
|
245
259
|
let arr = item.Name.split("\\").filter(
|
|
246
260
|
(element) => element
|
|
247
261
|
);
|
|
262
|
+
|
|
263
|
+
let instanceArr = string
|
|
264
|
+
.split(/[()]+/)
|
|
265
|
+
.filter(function (e) {
|
|
266
|
+
return e;
|
|
267
|
+
});
|
|
268
|
+
|
|
248
269
|
return {
|
|
249
270
|
host: arr[0],
|
|
250
|
-
object:
|
|
271
|
+
object: instanceArr[0],
|
|
272
|
+
instance: instanceArr[1] ? instanceArr[1] : "",
|
|
251
273
|
counter: arr[2],
|
|
252
274
|
value: item.Value,
|
|
253
275
|
cstatus: item.CStatus,
|
|
@@ -257,9 +279,15 @@ class perfMonService {
|
|
|
257
279
|
let arr = returnResults.Name.split("\\").filter(
|
|
258
280
|
(element) => element
|
|
259
281
|
);
|
|
282
|
+
|
|
283
|
+
let instanceArr = string.split(/[()]+/).filter(function (e) {
|
|
284
|
+
return e;
|
|
285
|
+
});
|
|
286
|
+
|
|
260
287
|
newOutput = {
|
|
261
288
|
host: arr[0],
|
|
262
|
-
object:
|
|
289
|
+
object: instanceArr[0],
|
|
290
|
+
instance: instanceArr[1] ? instanceArr[1] : "",
|
|
263
291
|
counter: arr[2],
|
|
264
292
|
value: returnResults.Value,
|
|
265
293
|
cstatus: returnResults.CStatus,
|
|
@@ -543,7 +571,7 @@ class perfMonService {
|
|
|
543
571
|
*/
|
|
544
572
|
addCounter(sessionHandle, counter) {
|
|
545
573
|
var XML;
|
|
546
|
-
var counterStr =
|
|
574
|
+
var counterStr = "";
|
|
547
575
|
var options = this._OPTIONS;
|
|
548
576
|
options.SOAPAction = `perfmonAddCounter`;
|
|
549
577
|
var server = this._HOST;
|
|
@@ -551,16 +579,17 @@ class perfMonService {
|
|
|
551
579
|
if (Array.isArray(counter)) {
|
|
552
580
|
counter.forEach(
|
|
553
581
|
(item) =>
|
|
554
|
-
|
|
555
|
-
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
|
|
563
|
-
|
|
582
|
+
(counterStr +=
|
|
583
|
+
"<soap:Counter>" +
|
|
584
|
+
"<soap:Name>" +
|
|
585
|
+
"\\\\" +
|
|
586
|
+
item.host +
|
|
587
|
+
"\\" +
|
|
588
|
+
item.object +
|
|
589
|
+
"\\" +
|
|
590
|
+
item.counter +
|
|
591
|
+
"</soap:Name>" +
|
|
592
|
+
"</soap:Counter>")
|
|
564
593
|
);
|
|
565
594
|
} else {
|
|
566
595
|
counterStr =
|
|
@@ -578,8 +607,6 @@ class perfMonService {
|
|
|
578
607
|
|
|
579
608
|
XML = util.format(XML_ADD_COUNTER_ENVELOPE, sessionHandle, counterStr);
|
|
580
609
|
|
|
581
|
-
console.log(XML);
|
|
582
|
-
|
|
583
610
|
var soapBody = Buffer.from(XML);
|
|
584
611
|
options.body = soapBody;
|
|
585
612
|
|
|
@@ -635,7 +662,7 @@ class perfMonService {
|
|
|
635
662
|
*/
|
|
636
663
|
removeCounter(sessionHandle, counter) {
|
|
637
664
|
var XML;
|
|
638
|
-
var counterStr =
|
|
665
|
+
var counterStr = "";
|
|
639
666
|
var options = this._OPTIONS;
|
|
640
667
|
options.SOAPAction = `perfmonRemoveCounter`;
|
|
641
668
|
var server = this._HOST;
|
|
@@ -643,16 +670,17 @@ class perfMonService {
|
|
|
643
670
|
if (Array.isArray(counter)) {
|
|
644
671
|
counter.forEach(
|
|
645
672
|
(item) =>
|
|
646
|
-
|
|
647
|
-
|
|
648
|
-
|
|
649
|
-
|
|
650
|
-
|
|
651
|
-
|
|
652
|
-
|
|
653
|
-
|
|
654
|
-
|
|
655
|
-
|
|
673
|
+
(counterStr +=
|
|
674
|
+
"<soap:Counter>" +
|
|
675
|
+
"<soap:Name>" +
|
|
676
|
+
"\\\\" +
|
|
677
|
+
item.host +
|
|
678
|
+
"\\" +
|
|
679
|
+
item.object +
|
|
680
|
+
"\\" +
|
|
681
|
+
item.counter +
|
|
682
|
+
"</soap:Name>" +
|
|
683
|
+
"</soap:Counter>")
|
|
656
684
|
);
|
|
657
685
|
} else {
|
|
658
686
|
counterStr =
|