Merge branch '83-ssl-stats' into 'develop'

Resolve "Add poller support for client-ssl and server-ssl stats" Closes F5Networks#83 See merge request cloudsolutions/f5-telemetry!51
blheatwole · Jan 17, 2019 · c5713d6 · c5713d6
2 parents cb5056f + cbff379
commit c5713d6
Show file tree

Hide file tree

Showing 5 changed files with 200 additions and 93 deletions.
diff --git a/INTERNAL_README.md b/INTERNAL_README.md
@@ -895,30 +895,7 @@ Otherwise *HTTP 404* will be returned. For output example see [System Info](#sys
             "tenant": "Common",
             "application": ""
         },
-        "/Common/http-explicit": {
-            "cookiePersistInserts": 0,
-            "getReqs": 0,
-            "maxKeepaliveReq": 0,
-            "numberReqs": 0,
-            "postReqs": 0,
-            "proxyReqs": 0,
-            "2xxResp": 0,
-            "3xxResp": 0,
-            "4xxResp": 0,
-            "5xxResp": 0,
-            "respLessThan2m": 0,
-            "respGreaterThan2m": 0,
-            "v10Reqs": 0,
-            "v10Resp": 0,
-            "v11Reqs": 0,
-            "v11Resp": 0,
-            "v9Reqs": 0,
-            "v9Resp": 0,
-            "name": "/Common/http-explicit",
-            "tenant": "Common",
-            "application": ""
-        },
-        "/Common/http-transparent": {
+        "/Sample_02/A1/custom_http_profile": {
             "cookiePersistInserts": 0,
             "getReqs": 0,
             "maxKeepaliveReq": 0,
@@ -937,34 +914,96 @@ Otherwise *HTTP 404* will be returned. For output example see [System Info](#sys
             "v11Resp": 0,
             "v9Reqs": 0,
             "v9Resp": 0,
-            "name": "/Common/http-transparent",
+            "name": "/Sample_02/A1/custom_http_profile",
+            "tenant": "Sample_02",
+            "application": "A1"
+        }
+    },
+    "clientSSLProfileStats": {
+        "/Common/clientssl": {
+            "currentCompatibleConnections": 0,
+            "currentConnections": 0,
+            "currentNativeConnections": 0,
+            "currentActiveHandshakes": 0,
+            "decryptedBytesIn": 0,
+            "decryptedBytesOut": 0,
+            "encryptedBytesIn": 0,
+            "encryptedBytesOut": 0,
+            "fatalAlerts": 0,
+            "handshakeFailures": 0,
+            "peercertInvalid": 0,
+            "peercertNone": 0,
+            "peercertValid": 0,
+            "protocolUses.dtlsv1": 0,
+            "protocolUses.sslv2": 0,
+            "protocolUses.sslv3": 0,
+            "protocolUses.tlsv1": 0,
+            "protocolUses.tlsv1_1": 0,
+            "protocolUses.tlsv1_2": 0,
+            "protocolUses.tlsv1_3": 0,
+            "recordsIn": 0,
+            "recordsOut": 0,
+            "name": "/Common/clientssl",
             "tenant": "Common",
             "application": ""
         },
-        "/Sample_02/A1/custom_http_profile": {
-            "cookiePersistInserts": 0,
-            "getReqs": 0,
-            "maxKeepaliveReq": 0,
-            "numberReqs": 0,
-            "postReqs": 0,
-            "proxyReqs": 0,
-            "2xxResp": 0,
-            "3xxResp": 0,
-            "4xxResp": 0,
-            "5xxResp": 0,
-            "respLessThan2m": 0,
-            "respGreaterThan2m": 0,
-            "v10Reqs": 0,
-            "v10Resp": 0,
-            "v11Reqs": 0,
-            "v11Resp": 0,
-            "v9Reqs": 0,
-            "v9Resp": 0,
-            "name": "/Sample_02/A1/custom_http_profile",
+        "/Sample_02/A1/webtls": {
+            "currentCompatibleConnections": 0,
+            "currentConnections": 0,
+            "currentNativeConnections": 0,
+            "currentActiveHandshakes": 0,
+            "decryptedBytesIn": 0,
+            "decryptedBytesOut": 0,
+            "encryptedBytesIn": 0,
+            "encryptedBytesOut": 0,
+            "fatalAlerts": 0,
+            "handshakeFailures": 0,
+            "peercertInvalid": 0,
+            "peercertNone": 0,
+            "peercertValid": 0,
+            "protocolUses.dtlsv1": 0,
+            "protocolUses.sslv2": 0,
+            "protocolUses.sslv3": 0,
+            "protocolUses.tlsv1": 0,
+            "protocolUses.tlsv1_1": 0,
+            "protocolUses.tlsv1_2": 0,
+            "protocolUses.tlsv1_3": 0,
+            "recordsIn": 0,
+            "recordsOut": 0,
+            "name": "/Sample_02/A1/webtls",
             "tenant": "Sample_02",
             "application": "A1"
         }
     },
+    "serverSSLProfileStats": {
+        "/Common/serverssl": {
+            "currentCompatibleConnections": 0,
+            "currentConnections": 0,
+            "currentNativeConnections": 0,
+            "currentActiveHandshakes": 0,
+            "decryptedBytesIn": 0,
+            "decryptedBytesOut": 0,
+            "encryptedBytesIn": 0,
+            "encryptedBytesOut": 0,
+            "fatalAlerts": 0,
+            "handshakeFailures": 0,
+            "peercertInvalid": 0,
+            "peercertNone": 0,
+            "peercertValid": 0,
+            "protocolUses.dtlsv1": 0,
+            "protocolUses.sslv2": 0,
+            "protocolUses.sslv3": 0,
+            "protocolUses.tlsv1": 0,
+            "protocolUses.tlsv1_1": 0,
+            "protocolUses.tlsv1_2": 0,
+            "protocolUses.tlsv1_3": 0,
+            "recordsIn": 0,
+            "recordsOut": 0,
+            "name": "/Common/serverssl",
+            "tenant": "Common",
+            "application": ""
+        }
+    },
     "tlsCerts": {
         "ca-bundle.crt": {
             "expirationDate": 1893455999,

diff --git a/examples/output/system_poller/output.json b/examples/output/system_poller/output.json
@@ -428,30 +428,7 @@
             "tenant": "Common",
             "application": ""
         },
-        "/Common/http-explicit": {
-            "cookiePersistInserts": 0,
-            "getReqs": 0,
-            "maxKeepaliveReq": 0,
-            "numberReqs": 0,
-            "postReqs": 0,
-            "proxyReqs": 0,
-            "2xxResp": 0,
-            "3xxResp": 0,
-            "4xxResp": 0,
-            "5xxResp": 0,
-            "respLessThan2m": 0,
-            "respGreaterThan2m": 0,
-            "v10Reqs": 0,
-            "v10Resp": 0,
-            "v11Reqs": 0,
-            "v11Resp": 0,
-            "v9Reqs": 0,
-            "v9Resp": 0,
-            "name": "/Common/http-explicit",
-            "tenant": "Common",
-            "application": ""
-        },
-        "/Common/http-transparent": {
+        "/Sample_02/A1/custom_http_profile": {
             "cookiePersistInserts": 0,
             "getReqs": 0,
             "maxKeepaliveReq": 0,
@@ -470,34 +447,96 @@
             "v11Resp": 0,
             "v9Reqs": 0,
             "v9Resp": 0,
-            "name": "/Common/http-transparent",
+            "name": "/Sample_02/A1/custom_http_profile",
+            "tenant": "Sample_02",
+            "application": "A1"
+        }
+    },
+    "clientSSLProfileStats": {
+        "/Common/clientssl": {
+            "currentCompatibleConnections": 0,
+            "currentConnections": 0,
+            "currentNativeConnections": 0,
+            "currentActiveHandshakes": 0,
+            "decryptedBytesIn": 0,
+            "decryptedBytesOut": 0,
+            "encryptedBytesIn": 0,
+            "encryptedBytesOut": 0,
+            "fatalAlerts": 0,
+            "handshakeFailures": 0,
+            "peercertInvalid": 0,
+            "peercertNone": 0,
+            "peercertValid": 0,
+            "protocolUses.dtlsv1": 0,
+            "protocolUses.sslv2": 0,
+            "protocolUses.sslv3": 0,
+            "protocolUses.tlsv1": 0,
+            "protocolUses.tlsv1_1": 0,
+            "protocolUses.tlsv1_2": 0,
+            "protocolUses.tlsv1_3": 0,
+            "recordsIn": 0,
+            "recordsOut": 0,
+            "name": "/Common/clientssl",
             "tenant": "Common",
             "application": ""
         },
-        "/Sample_02/A1/custom_http_profile": {
-            "cookiePersistInserts": 0,
-            "getReqs": 0,
-            "maxKeepaliveReq": 0,
-            "numberReqs": 0,
-            "postReqs": 0,
-            "proxyReqs": 0,
-            "2xxResp": 0,
-            "3xxResp": 0,
-            "4xxResp": 0,
-            "5xxResp": 0,
-            "respLessThan2m": 0,
-            "respGreaterThan2m": 0,
-            "v10Reqs": 0,
-            "v10Resp": 0,
-            "v11Reqs": 0,
-            "v11Resp": 0,
-            "v9Reqs": 0,
-            "v9Resp": 0,
-            "name": "/Sample_02/A1/custom_http_profile",
+        "/Sample_02/A1/webtls": {
+            "currentCompatibleConnections": 0,
+            "currentConnections": 0,
+            "currentNativeConnections": 0,
+            "currentActiveHandshakes": 0,
+            "decryptedBytesIn": 0,
+            "decryptedBytesOut": 0,
+            "encryptedBytesIn": 0,
+            "encryptedBytesOut": 0,
+            "fatalAlerts": 0,
+            "handshakeFailures": 0,
+            "peercertInvalid": 0,
+            "peercertNone": 0,
+            "peercertValid": 0,
+            "protocolUses.dtlsv1": 0,
+            "protocolUses.sslv2": 0,
+            "protocolUses.sslv3": 0,
+            "protocolUses.tlsv1": 0,
+            "protocolUses.tlsv1_1": 0,
+            "protocolUses.tlsv1_2": 0,
+            "protocolUses.tlsv1_3": 0,
+            "recordsIn": 0,
+            "recordsOut": 0,
+            "name": "/Sample_02/A1/webtls",
             "tenant": "Sample_02",
             "application": "A1"
         }
     },
+    "serverSSLProfileStats": {
+        "/Common/serverssl": {
+            "currentCompatibleConnections": 0,
+            "currentConnections": 0,
+            "currentNativeConnections": 0,
+            "currentActiveHandshakes": 0,
+            "decryptedBytesIn": 0,
+            "decryptedBytesOut": 0,
+            "encryptedBytesIn": 0,
+            "encryptedBytesOut": 0,
+            "fatalAlerts": 0,
+            "handshakeFailures": 0,
+            "peercertInvalid": 0,
+            "peercertNone": 0,
+            "peercertValid": 0,
+            "protocolUses.dtlsv1": 0,
+            "protocolUses.sslv2": 0,
+            "protocolUses.sslv3": 0,
+            "protocolUses.tlsv1": 0,
+            "protocolUses.tlsv1_1": 0,
+            "protocolUses.tlsv1_2": 0,
+            "protocolUses.tlsv1_3": 0,
+            "recordsIn": 0,
+            "recordsOut": 0,
+            "name": "/Common/serverssl",
+            "tenant": "Common",
+            "application": ""
+        }
+    },
     "tlsCerts": {
         "ca-bundle.crt": {
             "expirationDate": 1893455999,

diff --git a/examples/output/system_poller/schema.json b/examples/output/system_poller/schema.json
@@ -104,6 +104,12 @@
         "httpProfileStats": {
             "type": "object"
         },
+        "clientSSLProfileStats": {
+            "type": "object"
+        },
+        "serverSSLProfileStats": {
+            "type": "object"
+        },
         "tlsCerts": {
             "type": "object"
         },

diff --git a/src/nodejs/config/paths.json b/src/nodejs/config/paths.json
@@ -73,6 +73,14 @@
         {
             "name": "httpProfile",
             "endpoint": "/mgmt/tm/ltm/profile/http/stats"
+        },
+        {
+            "name": "clientSSLProfile",
+            "endpoint": "/mgmt/tm/ltm/profile/client-ssl/stats"
+        },
+        {
+            "name": "serverSSLProfile",
+            "endpoint": "/mgmt/tm/ltm/profile/server-ssl/stats"
         }
     ]
 }
diff --git a/src/nodejs/config/properties.json b/src/nodejs/config/properties.json
@@ -164,8 +164,20 @@
         },
         "httpProfileStats": {
             "key": "httpProfile",
-            "filterKeys": [ "ltm/profile/http/", "getReqs", "postReqs", "numberReqs", "maxKeepaliveReq", "v9Reqs", "v10Reqs", "v11Reqs", "v9Resp", "v10Resp", "v11Resp", "resp_2xxCnt", "resp_3xxCnt", "resp_4xxCnt", "resp_5xxCnt", "respBucket_2m", "respBucketLarge", "cookiePersistInserts", "proxyReqs" ],
-            "renameKeys": { "patterns": [ { "ltm/profile/http/": { "pattern": "http\/(.*)\/", "group": 1 } } ] },
+            "filterKeys": [ "ltm/profile/", "getReqs", "postReqs", "numberReqs", "maxKeepaliveReq", "v9Reqs", "v10Reqs", "v11Reqs", "v9Resp", "v10Resp", "v11Resp", "resp_2xxCnt", "resp_3xxCnt", "resp_4xxCnt", "resp_5xxCnt", "respBucket_2m", "respBucketLarge", "cookiePersistInserts", "proxyReqs" ],
+            "renameKeys": { "patterns": { "ltm/profile/http/": { "pattern": "http\/(.*)\/", "group": 1 } } },
+            "addKeysByTag": true
+        },
+        "clientSSLProfileStats": {
+            "key": "clientSSLProfile",
+            "filterKeys": [ "ltm/profile/", "common.encryptedBytesIn", "common.encryptedBytesOut", "common.decryptedBytesIn", "common.decryptedBytesOut", "common.recordsIn", "common.recordsOut", "common.curConns", "common.curNativeConns", "common.curCompatConns", "common.currentActiveHandshakes", "common.fatalAlerts", "common.handshakeFailures", "common.protocolUses.dtlsv1", "common.protocolUses.sslv2", "common.protocolUses.sslv3", "common.protocolUses.tlsv1", "common.protocolUses.tlsv1_1", "common.protocolUses.tlsv1_2", "common.protocolUses.tlsv1_3", "common.peercertValid", "common.peercertInvalid", "common.peercertNone" ],
+            "renameKeys": { "patterns": { "ltm/profile/client-ssl/": { "pattern": "client-ssl\/(.*)\/", "group": 1 }, "common.": { "pattern": "common.(.*)", "group": 1 } } },
+            "addKeysByTag": true
+        },
+        "serverSSLProfileStats": {
+            "key": "serverSSLProfile",
+            "filterKeys": [ "ltm/profile/", "common.encryptedBytesIn", "common.encryptedBytesOut", "common.decryptedBytesIn", "common.decryptedBytesOut", "common.recordsIn", "common.recordsOut", "common.curConns", "common.curNativeConns", "common.curCompatConns",  "common.curConns", "common.curNativeConns", "common.curCompatConns", "common.currentActiveHandshakes", "common.fatalAlerts", "common.handshakeFailures", "common.protocolUses.dtlsv1", "common.protocolUses.sslv2", "common.protocolUses.sslv3", "common.protocolUses.tlsv1", "common.protocolUses.tlsv1_1", "common.protocolUses.tlsv1_2", "common.protocolUses.tlsv1_3", "common.peercertValid", "common.peercertInvalid", "common.peercertNone" ],
+            "renameKeys": { "patterns": { "ltm/profile/server-ssl/": { "pattern": "server-ssl\/(.*)\/", "group": 1 }, "common.": { "pattern": "common.(.*)", "group": 1 } } },
             "addKeysByTag": true
         },
         "tlsCerts": {
@@ -200,7 +212,10 @@
                 "resp_4xxCnt": { "constant": "4xxResp" },
                 "resp_5xxCnt": { "constant": "5xxResp" },
                 "respBucket_2m": { "constant": "respLessThan2m" },
-                "respBucketLarge": { "constant": "respGreaterThan2m" }
+                "respBucketLarge": { "constant": "respGreaterThan2m" },
+                "curConns": { "constant": "currentConnections" },
+                "curNativeConns": { "constant": "currentNativeConnections" },
+                "curCompatConns": { "constant": "currentCompatibleConnections" }
             },
             "options": {
                 "exactMatch": true