Added cdx3, prod3

ukwa · Feb 2, 2023 · 1e0d418 · 1e0d418
1 parent 82afd99
commit 1e0d418
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 4 deletions.
diff --git a/monitor/docker-compose.yml b/monitor/docker-compose.yml
@@ -53,6 +53,7 @@ services:
       - "beta2:192.168.45.38"
 #      - "cdx1:192.168.45.7"
       - "cdx2:192.168.45.8"
+      - "cdx3:192.168.45.19"
       - "clamd:192.168.45.87"
       - "clamd-lb1:192.168.45.50"
       - "clamd-lb2:192.168.45.51"
@@ -76,6 +77,15 @@ services:
       - "gluster01:192.168.45.111"
       - "gluster02:192.168.45.112"
       - "gluster03:192.168.45.113"
+      - "gluster04:192.168.45.114"
+      - "gluster05:192.168.45.115"
+      - "gluster06:192.168.45.116"
+      - "gluster07:192.168.45.120"
+      - "gluster08:192.168.45.121"
+      - "gluster09:192.168.45.122"
+      - "gluster10:192.168.45.123"
+      - "gluster11:192.168.45.124"
+      - "gluster12:192.168.45.125"
       - "gluster13:192.168.45.126"
       - "gluster14:192.168.45.127"
       - "gluster15:192.168.45.128"
@@ -93,6 +103,8 @@ services:
       - "h3httpfs1:192.168.45.184"
       - "h3httpfs2:192.168.45.190"
       - "h3httpfs3:192.168.45.198"
+      - "h3httpfs4:192.168.45.199"
+      - "h3httpfs5:192.168.45.200"
       - "h3jh:192.168.45.183"
       - "h3nn:192.168.45.181"
       - "h3rm:192.168.45.182"
@@ -117,11 +129,13 @@ services:
       - "ldukwa-proxy:192.168.45.17"
       - "logs:192.168.45.32"
       - "mapred:192.168.45.18"
+      - "mapred2:192.168.45.31"
       - "monitor:192.168.45.204"
       - "namenode-backup:192.168.1.105"
       - "namenode:192.168.1.103"
       - "prod1:192.168.45.5"
       - "prod2:192.168.45.6"
+      - "prod3:192.168.45.16"
       - "priv-gtw-n1:192.168.45.29"
       - "sh:192.168.45.2"
       - "solr1:192.168.1.71"
@@ -132,6 +146,7 @@ services:
       - "syslog:192.168.45.9"
       - "wa-jupyter:172.16.202.75"
       - "wa-www:192.168.45.10"
+      - "wa-www2:192.168.45.11"
       - "zk4:192.168.1.84"
       - "zk5:192.168.1.85"
       - "zk6:192.168.1.86"

diff --git a/monitor/grafana/provisioning/dashboards/daily_dashboard.json b/monitor/grafana/provisioning/dashboards/daily_dashboard.json
@@ -436,7 +436,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "hdfs_under_replicated_block_count{instance='hdfs-exporter.dapi.wa.bl.uk:80'}",
+          "expr": "hdfs_under_replicated_block_count{instance='hdfs-exporter.bapi.wa.bl.uk:80'}",
           "format": "time_series",
           "instant": true,
           "intervalFactor": 1,
@@ -521,7 +521,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "hdfs_used_percent{instance='hdfs-exporter.dapi.wa.bl.uk:80'}",
+          "expr": "hdfs_used_percent{instance='hdfs-exporter.bapi.wa.bl.uk:80'}",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "",
@@ -602,7 +602,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "hdfs_node_count{status='dead',instance='hdfs-exporter.dapi.wa.bl.uk:80'}",
+          "expr": "hdfs_node_count{status='dead',instance='hdfs-exporter.bapi.wa.bl.uk:80'}",
           "format": "time_series",
           "instant": true,
           "intervalFactor": 1,
@@ -683,7 +683,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "hdfs_node_count{status='live',instance='hdfs-exporter.dapi.wa.bl.uk:80'}",
+          "expr": "hdfs_node_count{status='live',instance='hdfs-exporter.bapi.wa.bl.uk:80'}",
           "format": "time_series",
           "instant": true,
           "intervalFactor": 1,

diff --git a/monitor/prometheus/prometheus.yml-template b/monitor/prometheus/prometheus.yml-template
@@ -34,20 +34,24 @@ scrape_configs:
         - 'dev1:9100'
         - 'dev2:9100'
         - 'mapred:9100'
+        - 'mapred2:9100'
         - 'prod1:9100'
         - 'prod2:9100'
+        - 'prod3:9100'
 
   - job_name: 'discovery_access'
     static_configs:
       - targets:
         - 'access:9100'
 #        - 'cdx1:9100'
         - 'cdx2:9100'
+        - 'cdx3:9100'
         - 'data.bl.uk:9100'
         - 'intranet:9100'
         - 'jupyter2:9100'
         - 'wa-jupyter:9100'
         - 'wa-www:9100'
+        - 'wa-www2:9100'
         - 'wa-www:3903' # mtail http status metrics
 
   - job_name: 'gluster'
@@ -57,6 +61,15 @@ scrape_configs:
         - 'gluster01:9100'
         - 'gluster02:9100'
         - 'gluster03:9100'
+        - 'gluster04:9100'
+        - 'gluster05:9100'
+        - 'gluster06:9100'
+        - 'gluster07:9100'
+        - 'gluster08:9100'
+        - 'gluster09:9100'
+        - 'gluster10:9100'
+        - 'gluster11:9100'
+        - 'gluster12:9100'
         - 'gluster13:9100'
         - 'gluster14:9100'
         - 'gluster15:9100'

diff --git a/stat-pusher/.gitignore b/stat-pusher/.gitignore
@@ -0,0 +1,3 @@
+logs/
+*pid
+*pid.lock