@itentialopensource/adapter-thruk_monitoring 0.4.1 → 0.4.3
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/CHANGELOG.md +16 -0
- package/metadata.json +7 -4
- package/package.json +6 -6
- package/refs?service=git-upload-pack +0 -0
- package/report/adapterInfo.json +4 -4
- package/sampleProperties.json +3 -3
- package/test/integration/adapterTestConnectivity.js +0 -24
- package/test/integration/adapterTestIntegration.js +11 -7
- package/test/unit/adapterTestUnit.js +15 -11
- package/compliance-report.json +0 -9
- package/compliance-report.txt +0 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,4 +1,20 @@
|
|
|
1
1
|
|
|
2
|
+
## 0.4.3 [09-18-2024]
|
|
3
|
+
|
|
4
|
+
* add workshop and fix vulnerabilities
|
|
5
|
+
|
|
6
|
+
See merge request itentialopensource/adapters/adapter-thruk_monitoring!11
|
|
7
|
+
|
|
8
|
+
---
|
|
9
|
+
|
|
10
|
+
## 0.4.2 [08-14-2024]
|
|
11
|
+
|
|
12
|
+
* Changes made at 2024.08.14_18:36PM
|
|
13
|
+
|
|
14
|
+
See merge request itentialopensource/adapters/adapter-thruk_monitoring!10
|
|
15
|
+
|
|
16
|
+
---
|
|
17
|
+
|
|
2
18
|
## 0.4.1 [08-07-2024]
|
|
3
19
|
|
|
4
20
|
* Changes made at 2024.08.06_19:48PM
|
package/metadata.json
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "adapter-thruk_monitoring",
|
|
3
3
|
"webName": "Adapter for Integration to Thruk Monitoring",
|
|
4
|
+
"supportLevel": "community",
|
|
4
5
|
"vendor": "Thruk",
|
|
5
6
|
"product": "Monitoring",
|
|
7
|
+
"techAlliance": false,
|
|
6
8
|
"osVersion": [],
|
|
7
9
|
"apiVersions": [],
|
|
8
10
|
"iapVersions": [
|
|
@@ -38,7 +40,7 @@
|
|
|
38
40
|
"storeLink": "",
|
|
39
41
|
"npmLink": "https://www.npmjs.com/package/@itentialopensource/adapter-thruk_monitoring",
|
|
40
42
|
"repoLink": "https://gitlab.com/itentialopensource/adapters/adapter-thruk_monitoring",
|
|
41
|
-
"docLink": "https://
|
|
43
|
+
"docLink": "https://gitlab.com/itentialopensource/adapters/adapter-thruk_monitoring/-/blob/master/README.md?ref_type=heads",
|
|
42
44
|
"demoLinks": [],
|
|
43
45
|
"trainingLinks": [
|
|
44
46
|
{
|
|
@@ -58,7 +60,9 @@
|
|
|
58
60
|
"link": "https://www.thruk.org/documentation/rest.html",
|
|
59
61
|
"public": true
|
|
60
62
|
}
|
|
61
|
-
]
|
|
63
|
+
],
|
|
64
|
+
"workshopLinks": [],
|
|
65
|
+
"workshopHomePage": "https://www.itential.com/get-started/"
|
|
62
66
|
},
|
|
63
67
|
"assets": [],
|
|
64
68
|
"relatedItems": {
|
|
@@ -68,6 +72,5 @@
|
|
|
68
72
|
"workflowProjects": [],
|
|
69
73
|
"transformationProjects": [],
|
|
70
74
|
"exampleProjects": []
|
|
71
|
-
}
|
|
72
|
-
"supportLevel": "community"
|
|
75
|
+
}
|
|
73
76
|
}
|
package/package.json
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@itentialopensource/adapter-thruk_monitoring",
|
|
3
|
-
"version": "0.4.
|
|
3
|
+
"version": "0.4.3",
|
|
4
4
|
"description": "This adapter integrates with system described as: Thruk.",
|
|
5
5
|
"main": "adapter.js",
|
|
6
6
|
"wizardVersion": "2.44.7",
|
|
7
|
-
"engineVersion": "1.
|
|
7
|
+
"engineVersion": "1.68.2",
|
|
8
8
|
"adapterType": "http",
|
|
9
9
|
"scripts": {
|
|
10
10
|
"artifactize": "npm i && node utils/packModificationScript.js",
|
|
@@ -54,22 +54,22 @@
|
|
|
54
54
|
"author": "Itential",
|
|
55
55
|
"homepage": "https://gitlab.com/itentialopensource/adapters/adapter-thruk_monitoring#readme",
|
|
56
56
|
"dependencies": {
|
|
57
|
-
"@itentialopensource/adapter-utils": "^5.
|
|
57
|
+
"@itentialopensource/adapter-utils": "^5.8.0",
|
|
58
58
|
"acorn": "^8.12.1",
|
|
59
59
|
"ajv": "^8.17.1",
|
|
60
|
-
"axios": "^1.7.
|
|
60
|
+
"axios": "^1.7.4",
|
|
61
61
|
"commander": "^11.0.0",
|
|
62
62
|
"dns-lookup-promise": "^1.0.4",
|
|
63
63
|
"fs-extra": "^11.2.0",
|
|
64
64
|
"json-query": "^2.2.2",
|
|
65
|
-
"mocha": "^10.7.
|
|
65
|
+
"mocha": "^10.7.3",
|
|
66
66
|
"mocha-param": "^2.0.1",
|
|
67
67
|
"mongodb": "^4.16.0",
|
|
68
68
|
"ping": "^0.4.4",
|
|
69
69
|
"prompts": "^2.4.2",
|
|
70
70
|
"readline-sync": "^1.4.10",
|
|
71
71
|
"semver": "^7.6.3",
|
|
72
|
-
"winston": "^3.
|
|
72
|
+
"winston": "^3.14.2"
|
|
73
73
|
},
|
|
74
74
|
"devDependencies": {
|
|
75
75
|
"chai": "^4.3.7",
|
|
Binary file
|
package/report/adapterInfo.json
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "0.
|
|
2
|
+
"version": "0.4.2",
|
|
3
3
|
"configLines": 5936,
|
|
4
4
|
"scriptLines": 1783,
|
|
5
5
|
"codeLines": 9928,
|
|
6
|
-
"testLines":
|
|
7
|
-
"testCases":
|
|
8
|
-
"totalCodeLines":
|
|
6
|
+
"testLines": 8234,
|
|
7
|
+
"testCases": 422,
|
|
8
|
+
"totalCodeLines": 19945,
|
|
9
9
|
"wfTasks": 121
|
|
10
10
|
}
|
package/sampleProperties.json
CHANGED
|
@@ -137,7 +137,7 @@
|
|
|
137
137
|
"ostypePrefix": "meraki-",
|
|
138
138
|
"port": "{port}",
|
|
139
139
|
"ipaddress": "{ip_addr}",
|
|
140
|
-
"serial"
|
|
140
|
+
"serial": "{serial}"
|
|
141
141
|
}
|
|
142
142
|
}
|
|
143
143
|
],
|
|
@@ -163,7 +163,7 @@
|
|
|
163
163
|
"ostypePrefix": "meraki-",
|
|
164
164
|
"port": "{port}",
|
|
165
165
|
"ipaddress": "{ip_addr}",
|
|
166
|
-
"serial"
|
|
166
|
+
"serial": "{serial}",
|
|
167
167
|
"id": "{myid}"
|
|
168
168
|
}
|
|
169
169
|
}
|
|
@@ -247,7 +247,7 @@
|
|
|
247
247
|
"ostypePrefix": "meraki-",
|
|
248
248
|
"port": "{port}",
|
|
249
249
|
"ipaddress": "{ip_addr}",
|
|
250
|
-
"serial"
|
|
250
|
+
"serial": "{serial}",
|
|
251
251
|
"id": "{myid}"
|
|
252
252
|
}
|
|
253
253
|
}
|
|
@@ -4,7 +4,6 @@
|
|
|
4
4
|
/* eslint no-unused-vars: warn */
|
|
5
5
|
|
|
6
6
|
const assert = require('assert');
|
|
7
|
-
const http = require('http');
|
|
8
7
|
const https = require('https');
|
|
9
8
|
const mocha = require('mocha');
|
|
10
9
|
const ping = require('ping');
|
|
@@ -53,29 +52,6 @@ describe('[integration] Adapter Test', () => {
|
|
|
53
52
|
});
|
|
54
53
|
});
|
|
55
54
|
|
|
56
|
-
it('Support HTTP on port 80', (done) => {
|
|
57
|
-
const requestOptions = {
|
|
58
|
-
host,
|
|
59
|
-
port: 80,
|
|
60
|
-
method: 'HEAD'
|
|
61
|
-
};
|
|
62
|
-
|
|
63
|
-
const req = http.request(requestOptions, (res) => {
|
|
64
|
-
try {
|
|
65
|
-
assert.ok(res.statusCode >= 200 && res.statusCode < 400);
|
|
66
|
-
done();
|
|
67
|
-
} catch (error) {
|
|
68
|
-
done(error);
|
|
69
|
-
}
|
|
70
|
-
});
|
|
71
|
-
|
|
72
|
-
req.on('error', (err) => {
|
|
73
|
-
done(err);
|
|
74
|
-
});
|
|
75
|
-
|
|
76
|
-
req.end();
|
|
77
|
-
});
|
|
78
|
-
|
|
79
55
|
it('Support HTTPS on port 443', (done) => {
|
|
80
56
|
const requestOptions = {
|
|
81
57
|
host,
|
|
@@ -36,13 +36,17 @@ const samProps = require(`${adaptdir}/sampleProperties.json`).properties;
|
|
|
36
36
|
// these variables can be changed to run in integrated mode so easier to set them here
|
|
37
37
|
// always check these in with bogus data!!!
|
|
38
38
|
samProps.stub = true;
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
samProps.
|
|
42
|
-
samProps.
|
|
43
|
-
samProps.
|
|
44
|
-
samProps.
|
|
45
|
-
samProps.
|
|
39
|
+
|
|
40
|
+
// uncomment if connecting
|
|
41
|
+
// samProps.host = 'replace.hostorip.here';
|
|
42
|
+
// samProps.authentication.username = 'username';
|
|
43
|
+
// samProps.authentication.password = 'password';
|
|
44
|
+
// samProps.authentication.token = 'password';
|
|
45
|
+
// samProps.protocol = 'http';
|
|
46
|
+
// samProps.port = 80;
|
|
47
|
+
// samProps.ssl.enabled = false;
|
|
48
|
+
// samProps.ssl.accept_invalid_cert = false;
|
|
49
|
+
|
|
46
50
|
if (samProps.request.attempt_timeout < 30000) {
|
|
47
51
|
samProps.request.attempt_timeout = 30000;
|
|
48
52
|
}
|
|
@@ -36,13 +36,17 @@ const samProps = require(`${adaptdir}/sampleProperties.json`).properties;
|
|
|
36
36
|
// these variables can be changed to run in integrated mode so easier to set them here
|
|
37
37
|
// always check these in with bogus data!!!
|
|
38
38
|
samProps.stub = true;
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
samProps.
|
|
42
|
-
samProps.
|
|
43
|
-
samProps.
|
|
44
|
-
samProps.
|
|
45
|
-
samProps.
|
|
39
|
+
|
|
40
|
+
// uncomment if connecting
|
|
41
|
+
// samProps.host = 'replace.hostorip.here';
|
|
42
|
+
// samProps.authentication.username = 'username';
|
|
43
|
+
// samProps.authentication.password = 'password';
|
|
44
|
+
// samProps.authentication.token = 'password';
|
|
45
|
+
// samProps.protocol = 'http';
|
|
46
|
+
// samProps.port = 80;
|
|
47
|
+
// samProps.ssl.enabled = false;
|
|
48
|
+
// samProps.ssl.accept_invalid_cert = false;
|
|
49
|
+
|
|
46
50
|
samProps.request.attempt_timeout = 1200000;
|
|
47
51
|
const attemptTimeout = samProps.request.attempt_timeout;
|
|
48
52
|
const { stub } = samProps;
|
|
@@ -315,15 +319,15 @@ describe('[unit] Thruk_monitoring Adapter Test', () => {
|
|
|
315
319
|
assert.notEqual(null, packageDotJson.dependencies);
|
|
316
320
|
assert.notEqual('', packageDotJson.dependencies);
|
|
317
321
|
assert.equal('^8.17.1', packageDotJson.dependencies.ajv);
|
|
318
|
-
assert.equal('^1.7.
|
|
322
|
+
assert.equal('^1.7.4', packageDotJson.dependencies.axios);
|
|
319
323
|
assert.equal('^11.0.0', packageDotJson.dependencies.commander);
|
|
320
324
|
assert.equal('^11.2.0', packageDotJson.dependencies['fs-extra']);
|
|
321
|
-
assert.equal('^10.7.
|
|
325
|
+
assert.equal('^10.7.3', packageDotJson.dependencies.mocha);
|
|
322
326
|
assert.equal('^2.0.1', packageDotJson.dependencies['mocha-param']);
|
|
323
327
|
assert.equal('^0.4.4', packageDotJson.dependencies.ping);
|
|
324
328
|
assert.equal('^1.4.10', packageDotJson.dependencies['readline-sync']);
|
|
325
329
|
assert.equal('^7.6.3', packageDotJson.dependencies.semver);
|
|
326
|
-
assert.equal('^3.
|
|
330
|
+
assert.equal('^3.14.2', packageDotJson.dependencies.winston);
|
|
327
331
|
done();
|
|
328
332
|
} catch (error) {
|
|
329
333
|
log.error(`Test Failure: ${error}`);
|
|
@@ -561,7 +565,7 @@ describe('[unit] Thruk_monitoring Adapter Test', () => {
|
|
|
561
565
|
log.error(`Adapter Exception: ${error}`);
|
|
562
566
|
done(error);
|
|
563
567
|
}
|
|
564
|
-
});
|
|
568
|
+
}).timeout(attemptTimeout);
|
|
565
569
|
});
|
|
566
570
|
|
|
567
571
|
describe('propertiesSchema.json', () => {
|
package/compliance-report.json
DELETED
package/compliance-report.txt
DELETED
|
@@ -1,5 +0,0 @@
|
|
|
1
|
-
---------------------------------------------------------------------------------------------
|
|
2
|
-
**** Project Compliance Summary ****
|
|
3
|
-
0 project(s) are not valid
|
|
4
|
-
0 project(s) are valid
|
|
5
|
-
---------------------------------------------------------------------------------------------
|