From 36eef9826462eb23891eb09d5c1a21daf2024cf3 Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Fri, 28 May 2021 12:38:28 +0300
Subject: [PATCH] Add monitoring for lwm2m and snmp transports

---
 .../dashboards/single_service_metrics.json         | 14 ++++++++++++--
 docker/monitoring/prometheus/prometheus.yml        | 11 ++++++++++-
 docker/tb-lwm2m-transport.env                      |  6 ++++++
 docker/tb-snmp-transport.env                       |  6 ++++++
 .../snmp/src/main/resources/tb-snmp-transport.yml  | 13 ++++++++++++-
 5 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/docker/monitoring/grafana/provisioning/dashboards/single_service_metrics.json b/docker/monitoring/grafana/provisioning/dashboards/single_service_metrics.json
index df33e3efb5..3236592727 100644
--- a/docker/monitoring/grafana/provisioning/dashboards/single_service_metrics.json
+++ b/docker/monitoring/grafana/provisioning/dashboards/single_service_metrics.json
@@ -949,9 +949,19 @@
             "selected": false,
             "text": "tb-coap-transport",
             "value": "tb-coap-transport"
+          },
+          {
+            "selected": false,
+            "text": "tb-lwm2m-transport",
+            "value": "tb-lwm2m-transport"
+          },
+          {
+            "selected": false,
+            "text": "tb-snmp-transport",
+            "value": "tb-snmp-transport"
           }
         ],
-        "query": "tb-core1,tb-core2,tb-rule-engine1,tb-rule-engine2,tb-mqtt-transport1,tb-mqtt-transport2,tb-http-transport1,tb-http-transport2,tb-coap-transport",
+        "query": "tb-core1,tb-core2,tb-rule-engine1,tb-rule-engine2,tb-mqtt-transport1,tb-mqtt-transport2,tb-http-transport1,tb-http-transport2,tb-coap-transport,tb-lwm2m-transport,tb-snmp-transport",
         "queryValue": "",
         "skipUrlSync": false,
         "type": "custom"
@@ -979,4 +989,4 @@
   "title": "Single Service Metrics",
   "uid": "lewbrddddlwjerwkj",
   "version": 1
-}
\ No newline at end of file
+}
diff --git a/docker/monitoring/prometheus/prometheus.yml b/docker/monitoring/prometheus/prometheus.yml
index a3b4c54e9c..a9c2a78dcd 100644
--- a/docker/monitoring/prometheus/prometheus.yml
+++ b/docker/monitoring/prometheus/prometheus.yml
@@ -70,7 +70,7 @@ scrape_configs:
     metrics_path: /actuator/prometheus
     static_configs:
       - targets: [ 'tb-http-transport1:8081' ]
-        -
+
   - job_name: 'tb-http-transport2'
     metrics_path: /actuator/prometheus
     static_configs:
@@ -81,3 +81,12 @@ scrape_configs:
     static_configs:
       - targets: [ 'tb-coap-transport:8081' ]
 
+  - job_name: 'tb-lwm2m-transport'
+    metrics_path: /actuator/prometheus
+    static_configs:
+      - targets: [ 'tb-lwm2m-transport:8081' ]
+
+  - job_name: 'tb-snmp-transport'
+    metrics_path: /actuator/prometheus
+    static_configs:
+      - targets: [ 'tb-snmp-transport:8081' ]
diff --git a/docker/tb-lwm2m-transport.env b/docker/tb-lwm2m-transport.env
index 6e6cad922b..f284803a46 100644
--- a/docker/tb-lwm2m-transport.env
+++ b/docker/tb-lwm2m-transport.env
@@ -4,3 +4,9 @@ ZOOKEEPER_URL=zookeeper:2181
 LWM2M_BIND_ADDRESS=0.0.0.0
 LWM2M_BIND_PORT=5685
 LWM2M_TIMEOUT=10000
+
+METRICS_ENABLED=true
+METRICS_ENDPOINTS_EXPOSE=prometheus
+WEB_APPLICATION_ENABLE=true
+WEB_APPLICATION_TYPE=servlet
+HTTP_BIND_PORT=8081
diff --git a/docker/tb-snmp-transport.env b/docker/tb-snmp-transport.env
index f92e30b78f..e2cc39d658 100644
--- a/docker/tb-snmp-transport.env
+++ b/docker/tb-snmp-transport.env
@@ -1,2 +1,8 @@
 ZOOKEEPER_ENABLED=true
 ZOOKEEPER_URL=zookeeper:2181
+
+METRICS_ENABLED=true
+METRICS_ENDPOINTS_EXPOSE=prometheus
+WEB_APPLICATION_ENABLE=true
+WEB_APPLICATION_TYPE=servlet
+HTTP_BIND_PORT=8081
diff --git a/transport/snmp/src/main/resources/tb-snmp-transport.yml b/transport/snmp/src/main/resources/tb-snmp-transport.yml
index ae524d5047..cb6e7d5953 100644
--- a/transport/snmp/src/main/resources/tb-snmp-transport.yml
+++ b/transport/snmp/src/main/resources/tb-snmp-transport.yml
@@ -14,6 +14,17 @@
 # limitations under the License.
 #
 
+# If you enabled process metrics you should also enable 'web-environment'.
+spring.main.web-environment: "${WEB_APPLICATION_ENABLE:false}"
+# If you enabled process metrics you should set 'web-application-type' to 'servlet' value.
+spring.main.web-application-type: "${WEB_APPLICATION_TYPE:none}"
+
+server:
+  # Server bind address (has no effect if web-environment is disabled).
+  address: "${HTTP_BIND_ADDRESS:0.0.0.0}"
+  # Server bind port (has no effect if web-environment is disabled).
+  port: "${HTTP_BIND_PORT:8083}"
+
 # Zookeeper connection parameters. Used for service discovery.
 zk:
   # Enable/disable zookeeper discovery service.
@@ -228,4 +239,4 @@ management:
     web:
       exposure:
         # Expose metrics endpoint (use value 'prometheus' to enable prometheus metrics).
-        include: '${METRICS_ENDPOINTS_EXPOSE:info}'
\ No newline at end of file
+        include: '${METRICS_ENDPOINTS_EXPOSE:info}'