Skip to content

Commit

Permalink
Addition of many hosts
Browse files Browse the repository at this point in the history
  • Loading branch information
@GilHoggarth
GilHoggarth committed Aug 2, 2023
1 parent 9395ed6 commit 98779fa
Show file tree
Hide file tree
Showing 4 changed files with 181 additions and 5 deletions.
78 changes: 77 additions & 1 deletion monitor/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ services:
- "crawler06:192.168.45.34"
- "crawler08:192.168.45.21"
- "data.bl.uk:192.168.45.230"
- "default-rhel6:192.168.45.236"
- "default-rhel7:192.168.45.237"
- "default-rhel9:192.168.45.238"
- "dev1:192.168.45.91"
- "dev2:192.168.45.92"
- "explorer:192.168.1.1"
Expand All @@ -94,14 +97,80 @@ services:
- "gluster16:192.168.45.129"
- "gluster17:192.168.45.130"
- "gluster18:192.168.45.131"
# - "grunt11:192.168.1.111"
# grunts
- "grunt03:192.168.1.4"
- "grunt04:192.168.1.201"
- "grunt09:192.168.1.109"
- "grunt11:192.168.1.111"
- "grunt12:192.168.1.112"
- "grunt13:192.168.1.113"
- "grunt14:192.168.1.114"
- "grunt15:192.168.1.115"
- "grunt16:192.168.1.116"
- "grunt17:192.168.1.117"
- "grunt18:192.168.1.118"
- "grunt19:192.168.1.119"
- "grunt21:192.168.1.121"
- "grunt22:192.168.1.122"
- "grunt23:192.168.1.123"
- "grunt24:192.168.1.124"
- "grunt25:192.168.1.125"
- "grunt26:192.168.1.126"
- "grunt27:192.168.1.127"
- "grunt28:192.168.1.128"
- "grunt29:192.168.1.129"
- "grunt31:192.168.1.131"
- "grunt32:192.168.1.132"
- "grunt33:192.168.1.133"
- "grunt34:192.168.1.134"
- "grunt35:192.168.1.135"
- "grunt36:192.168.1.136"
- "grunt37:192.168.1.137"
- "grunt38:192.168.1.138"
- "grunt39:192.168.1.139"
- "grunt41:192.168.1.141"
- "grunt42:192.168.1.142"
- "grunt43:192.168.1.143"
- "grunt44:192.168.1.144"
- "grunt45:192.168.1.145"
- "grunt46:192.168.1.146"
- "grunt47:192.168.1.147"
- "grunt48:192.168.1.148"
- "grunt49:192.168.1.149"
- "grunt51:192.168.1.151"
- "grunt61:192.168.1.161"
- "grunt62:192.168.1.162"
- "grunt76:192.168.1.178"
- "grunt77:192.168.1.179"
- "grunt78:192.168.1.180"
- "grunt79:192.168.1.184"
- "grunt80:192.168.1.185"
- "grunt81:192.168.1.186"
- "grunt82:192.168.1.187"
- "grunt83:192.168.1.188"
- "grunt84:192.168.1.189"
- "grunt85:192.168.1.190"
- "grunt86:192.168.1.191"
- "grunt87:192.168.1.192"
- "grunt88:192.168.1.193"
- "grunt89:192.168.1.194"
- "grunt91:192.168.1.196"
- "grunt92:192.168.1.197"
- "grunt93:192.168.1.198"
- "grunt94:192.168.1.199"
- "grunt95:192.168.1.200"
- "grunt96:192.168.1.101"
- "grunt97:192.168.1.202"
- "grunt98:192.168.1.203"
# eo grunts
- "h3dn1:192.168.45.191"
- "h3dn2:192.168.45.192"
- "h3dn3:192.168.45.193"
- "h3dn4:192.168.45.194"
- "h3dn5:192.168.45.195"
- "h3dn6:192.168.45.196"
- "h3dn7:192.168.45.197"
- "h3dn8:192.168.45.201"
- "h3httpfs1:192.168.45.184"
- "h3httpfs2:192.168.45.190"
- "h3httpfs3:192.168.45.198"
Expand All @@ -120,6 +189,11 @@ services:
- "hdfs-lb3:192.168.1.46"
- "hdfs-lb4:192.168.1.47"
- "hdfs-lb5:192.168.1.48"
- "hdfs-lb6:192.168.1.49"
- "hdfs-lb7:192.168.1.50"
- "hdfs-lb8:192.168.1.51"
- "hdfs-lb9:192.168.1.52"
- "hdfs-lb10:192.168.1.53"
- "ingest:192.168.45.60"
- "intranet:192.168.45.30"
- "jisc03:192.168.1.57"
Expand All @@ -128,6 +202,7 @@ services:
- "jisc-zk03:192.168.1.64"
- "jobtracker:192.168.1.104"
- "jupyter2:192.168.45.35"
- "knox:192.168.45.180"
- "ldukwa-proxy:192.168.45.17"
- "logs:192.168.45.32"
- "mapred:192.168.45.18"
Expand All @@ -144,6 +219,7 @@ services:
- "solr2:192.168.1.72"
- "solr3:192.168.1.73"
- "solr4:192.168.1.74"
- "solr5:192.168.1.75"
- "solr-proxy:192.168.45.33"
- "syslog:192.168.45.9"
- "wa-jupyter:172.16.202.75"
Expand Down
27 changes: 26 additions & 1 deletion monitor/grafana/provisioning/dashboards/wa_job.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -683,6 +683,11 @@
"multi": false,
"name": "job",
"options": [
{
"selected": true,
"text": "services",
"value": "services"
},
{
"selected": false,
"text": "discovery_access",
Expand All @@ -698,13 +703,18 @@
"text": "hadoop",
"value": "hadoop"
},
{
"selected": false,
"text": "hadoop3",
"value": "hadoop3"
},
{
"selected": false,
"text": "infrastructure",
"value": "infrastructure"
},
{
"selected": true,
"selected": false,
"text": "ingest_metadata",
"value": "ingest_metadata"
},
Expand All @@ -713,10 +723,25 @@
"text": "monitoring",
"value": "monitoring"
},
{
"selected": false,
"text": "airflow",
"value": "airflow"
},
{
"selected": false,
"text": "solr",
"value": "solr"
},
{
"selected": false,
"text": "federate",
"value": "federate"
},
{
"selected": false,
"text": "federate-dc",
"value": "federate-dc"
}
],
"query": "up{instance=~\".*\"}",
Expand Down
2 changes: 1 addition & 1 deletion monitor/grafana/provisioning/dashboards/wa_servers.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
"hiddenSeries": false,
"id": 2,
"legend": {
"alignAsTable": false,
"alignAsTable": true,
"avg": false,
"current": true,
"max": false,
Expand Down
79 changes: 77 additions & 2 deletions monitor/prometheus/prometheus.yml-template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,83 @@ scrape_configs:
- job_name: 'hadoop'
static_configs:
- targets:
# - 'grunt11:9100'
- 'jobtracker:9100'
- 'grunt03:9100'
- 'grunt04:9100'
- 'grunt09:9100'
- 'grunt11:9100'
- 'grunt12:9100'
- 'grunt13:9100'
- 'grunt14:9100'
- 'grunt15:9100'
- 'grunt16:9100'
- 'grunt17:9100'
- 'grunt18:9100'
- 'grunt19:9100'
- 'grunt21:9100'
- 'grunt22:9100'
- 'grunt23:9100'
- 'grunt24:9100'
- 'grunt25:9100'
- 'grunt26:9100'
- 'grunt27:9100'
- 'grunt28:9100'
- 'grunt29:9100'
- 'grunt31:9100'
- 'grunt32:9100'
- 'grunt33:9100'
- 'grunt34:9100'
- 'grunt35:9100'
- 'grunt36:9100'
- 'grunt37:9100'
- 'grunt38:9100'
- 'grunt39:9100'
- 'grunt41:9100'
- 'grunt42:9100'
- 'grunt43:9100'
- 'grunt44:9100'
- 'grunt45:9100'
- 'grunt46:9100'
- 'grunt47:9100'
- 'grunt48:9100'
- 'grunt49:9100'
- 'grunt51:9100'
- 'grunt61:9100'
- 'grunt62:9100'
- 'grunt76:9100'
- 'grunt77:9100'
- 'grunt78:9100'
- 'grunt79:9100'
- 'grunt80:9100'
- 'grunt81:9100'
- 'grunt82:9100'
- 'grunt83:9100'
- 'grunt84:9100'
- 'grunt85:9100'
- 'grunt86:9100'
- 'grunt87:9100'
- 'grunt88:9100'
- 'grunt89:9100'
- 'grunt91:9100'
- 'grunt92:9100'
- 'grunt93:9100'
- 'grunt94:9100'
- 'grunt95:9100'
- 'grunt96:9100'
- 'grunt97:9100'
- 'grunt98:9100'
- 'hdfs:9100'
- 'hdfs-lb1:9100'
- 'hdfs-lb10:9100'
- 'hdfs-lb2:9100'
- 'hdfs-lb3:9100'
- 'hdfs-lb4:9100'
- 'hdfs-lb5:9100'
- 'hdfs-lb6:9100'
- 'hdfs-lb7:9100'
- 'hdfs-lb8:9100'
- 'hdfs-lb9:9100'
- 'jobtracker:9100'
- 'knox:9100'
- 'namenode:9100'
- 'namenode-backup:9100'

Expand All @@ -101,6 +170,7 @@ scrape_configs:
- 'h3dn5:9100'
- 'h3dn6:9100'
- 'h3dn7:9100'
- 'h3dn8:9100'
- 'h3httpfs1:9100'
- 'h3httpfs2:9100'
- 'h3httpfs3:9100'
Expand Down Expand Up @@ -135,6 +205,9 @@ scrape_configs:
- job_name: 'infrastructure'
static_configs:
- targets:
- 'default-rhel6:9100'
- 'default-rhel7:9100'
- 'default-rhel9:9100'
- 'explorer:9100'
- 'explorer2:9100'
- 'ftp:9100'
Expand Down Expand Up @@ -183,6 +256,7 @@ scrape_configs:
- 'solr2:9100'
- 'solr3:9100'
- 'solr4:9100'
- 'solr5:9100'
- 'solr-proxy:9100'
- 'zk4:9100'
- 'zk5:9100'
Expand All @@ -196,6 +270,7 @@ scrape_configs:
- 'solr2:3903'
- 'solr3:3903'
- 'solr4:3903'
- 'solr5:3903'
- 'solr-proxy:3903'

- job_name: 'solr-query'
Expand Down

0 comments on commit 98779fa

Please sign in to comment.