From 4ce9ba488754659175e673a907b2872337d3216e Mon Sep 17 00:00:00 2001
From: Nathan Kinkade <kinkade@measurementlab.net>
Date: Fri, 19 Jul 2019 14:49:44 -0600
Subject: [PATCH 1/5] Renames the generate_prometheus_targets.sh to
 generate_legacy_prometheus_targets.sh to avoid confusion with the new
 generate_prometheus_targets.sh script in m-lab/prometheus-support.

---
 ...prometheus_targets.sh => generate_legacy_prometheus_targets.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename generate_prometheus_targets.sh => generate_legacy_prometheus_targets.sh (100%)

diff --git a/generate_prometheus_targets.sh b/generate_legacy_prometheus_targets.sh
similarity index 100%
rename from generate_prometheus_targets.sh
rename to generate_legacy_prometheus_targets.sh

From 7747d74c404d44b7dce47fd20baf068d2be846a2 Mon Sep 17 00:00:00 2001
From: Nathan Kinkade <kinkade@measurementlab.net>
Date: Fri, 19 Jul 2019 14:55:31 -0600
Subject: [PATCH 2/5] Renames deploy_prometheus_targets.sh script to include
 the work 'legacy' to avoid confusion with the deploy_prometheus_targets.sh
 script in the m-lab/prometheus-support repo.

---
 ...y_prometheus_targets.sh => deploy_legacy_prometheus_targets.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename deploy_prometheus_targets.sh => deploy_legacy_prometheus_targets.sh (100%)

diff --git a/deploy_prometheus_targets.sh b/deploy_legacy_prometheus_targets.sh
similarity index 100%
rename from deploy_prometheus_targets.sh
rename to deploy_legacy_prometheus_targets.sh

From e9693121c19a5600b8a0ff3c1bfce0285db67216 Mon Sep 17 00:00:00 2001
From: Nathan Kinkade <kinkade@measurementlab.net>
Date: Fri, 19 Jul 2019 16:27:24 -0600
Subject: [PATCH 3/5] Removes generation of non-legacy Prom targets. Non-legacy
 targets are now generated in the prometheus-support repo.

---
 .travis.yml                           |   6 +-
 deploy_legacy_prometheus_targets.sh   |   3 +-
 generate_legacy_prometheus_targets.sh | 241 ++++----------------------
 3 files changed, 35 insertions(+), 215 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 418a3f7..be484da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,7 +44,7 @@ deploy:
 ############################################################################
 # Sandbox.
 - provider: script
-  script: $TRAVIS_BUILD_DIR/deploy_prometheus_targets.sh mlab-sandbox global
+  script: $TRAVIS_BUILD_DIR/deploy_legacy_prometheus_targets.sh mlab-sandbox
   skip_cleanup: true
   on:
     repo: m-lab/operator
@@ -54,7 +54,7 @@ deploy:
 ############################################################################
 # Staging, on master.
 - provider: script
-  script: $TRAVIS_BUILD_DIR/deploy_prometheus_targets.sh mlab-staging global
+  script: $TRAVIS_BUILD_DIR/deploy_legacy_prometheus_targets.sh mlab-staging
   skip_cleanup: true
   on:
     repo: m-lab/operator
@@ -63,7 +63,7 @@ deploy:
 ############################################################################
 # Production, on tags.
 - provider: script
-  script: $TRAVIS_BUILD_DIR/deploy_prometheus_targets.sh mlab-oti global
+  script: $TRAVIS_BUILD_DIR/deploy_legacy_prometheus_targets.sh mlab-oti
   skip_cleanup: true
   on:
     repo: m-lab/operator
diff --git a/deploy_legacy_prometheus_targets.sh b/deploy_legacy_prometheus_targets.sh
index 5e41b39..fa0fd78 100755
--- a/deploy_legacy_prometheus_targets.sh
+++ b/deploy_legacy_prometheus_targets.sh
@@ -8,14 +8,13 @@ CACHE_CONTROL="Cache-Control:private, max-age=0, no-transform"
 
 USAGE="Usage: $0 <project>"
 PROJECT=${1:?Please provide project name: $USAGE}
-GROUP=${2:?Please provide monitoring group name: $USAGE}
 
 # Root directory of this script.
 SCRIPTDIR=$( dirname "${BASH_SOURCE[0]}" )
 BASEDIR=${PWD}
 
 # Generate the configs.
-${SCRIPTDIR}/generate_prometheus_targets.sh ${GROUP} > /dev/null
+${SCRIPTDIR}/generate_legacy_prometheus_targets.sh > /dev/null
 
 # Be sure that gcloud is PATH
 source "${HOME}/google-cloud-sdk/path.bash.inc"
diff --git a/generate_legacy_prometheus_targets.sh b/generate_legacy_prometheus_targets.sh
index e31aa84..399d949 100755
--- a/generate_legacy_prometheus_targets.sh
+++ b/generate_legacy_prometheus_targets.sh
@@ -6,9 +6,6 @@ set -euxo pipefail
 SCRIPTDIR=$( dirname "${BASH_SOURCE[0]}" )
 BASEDIR=${PWD}
 
-USAGE="Usage: $0 <GROUP>"
-GROUP=${1:?Please provide monitoring group name: $USAGE}
-
 # Create all output directories.
 for project in mlab-sandbox mlab-staging mlab-oti ; do
   mkdir -p ${BASEDIR}/gen/${project}/prometheus/{legacy-targets,blackbox-targets,blackbox-targets-ipv6,snmp-targets,script-targets}
@@ -18,7 +15,7 @@ done
 SELECT_mlab_sandbox=$( cat ${SCRIPTDIR}/plsync/testing_patterns.txt | xargs | sed -e 's/ /|/g' )
 
 # All mlab4's and the set of canary machines.
-SELECT_mlab_staging=$( cat ${SCRIPTDIR}/plsync/staging_patterns.txt ${SCRIPTDIR}/plsync/canary_machines.txt | xargs | sed -e 's/ /|/g' )
+SELECT_mlab_staging=$( cat ${SCRIPTDIR}/plsync/staging_patterns.txt | xargs | sed -e 's/ /|/g' )
 
 # All sites *excluding* test sites.
 SELECT_mlab_oti=$( cat ${SCRIPTDIR}/plsync/production_patterns.txt | xargs | sed -e 's/ /|/g' )
@@ -43,211 +40,35 @@ for project in mlab-sandbox mlab-staging mlab-oti ; do
     # blackbox_exporter on for IPv6 targets.
     bbe_port=BBE_IPV6_PORT_${project/-/_}
 
-    if [[ ${GROUP} == scraper ]] ; then
-      # Rsyncd on port 7999.
-      ./legacyconfig.py --format=prom-targets \
-          --template_target={{hostname}}:7999 \
-          --label service=rsyncd \
-          --label module=rsyncd_online \
-          --rsync \
-          --select "${!pattern}" > ${output}/blackbox-targets/rsyncd.json
-
-      # SSH on port 806 over IPv4
-      ./legacyconfig.py --format=prom-targets-nodes \
-          --template_target={{hostname}}:806 \
-          --label service=ssh806 \
-          --label module=ssh_v4_online \
-          --select "${!pattern}" > ${output}/blackbox-targets/ssh806.json
-
-      # SSH on port 806 over IPv6
-      ./legacyconfig.py --format=prom-targets-nodes \
-          --template_target={{hostname}}:806 \
-          --label service=ssh806 \
-          --label module=ssh_v6_online \
-          --label __blackbox_port=${!bbe_port} \
-          --select "${!pattern}" \
-          --decoration "v6" > ${output}/blackbox-targets-ipv6/ssh806_ipv6.json
-
-      # Sidestream exporter in the npad experiment.
-      ./legacyconfig.py --format=prom-targets \
-          --template_target={{hostname}}:9090 \
-          --label service=sidestream \
-          --select "npad.iupui.(${!pattern})" > \
-              ${output}/legacy-targets/sidestream.json
-
-    elif [[ ${GROUP} == global ]] ; then
-
-      ########################################################################
-      # Note: The following configs select all servers. This allows us to
-      # experiment with monitoring many sites in sandbox or staging before
-      # production.
-      ########################################################################
-
-      # ndt7 SSL on port 443 over IPv4
-      ./mlabconfig.py --format=prom-targets \
-          --template_target={{hostname}}:443 \
-          --label service=ndt7 \
-          --label module=tcp_v4_online \
-          --select "ndt.iupui.(${!pattern})" > \
-              ${output}/blackbox-targets/ndt7.json
-
-      # ndt7 SSL on port 443 over IPv6
-      ./mlabconfig.py --format=prom-targets \
-          --template_target={{hostname}}:443 \
-          --label service=ndt7_ipv6 \
-          --label module=tcp_v6_online \
-          --label __blackbox_port=${!bbe_port} \
-          --select "ndt.iupui.(${!pattern})" \
-          --decoration "v6" > \
-              ${output}/blackbox-targets-ipv6/ndt7_ipv6.json
-
-      # NDT "raw" on port 3001 over IPv4
-      ./mlabconfig.py --format=prom-targets \
-          --template_target={{hostname}}:3001 \
-          --label service=ndt_raw \
-          --label module=tcp_v4_online \
-          --select "ndt.iupui.(${!pattern})" > \
-              ${output}/blackbox-targets/ndt_raw.json
-
-      # NDT "raw" on port 3001 over IPv6
-      ./mlabconfig.py --format=prom-targets \
-          --template_target={{hostname}}:3001 \
-          --label service=ndt_raw_ipv6 \
-          --label module=tcp_v6_online \
-          --label __blackbox_port=${!bbe_port} \
-          --select "ndt.iupui.(${!pattern})" \
-          --decoration "v6" > \
-              ${output}/blackbox-targets-ipv6/ndt_raw_ipv6.json
-
-      # NDT SSL on port 3010 over IPv4
-      ./mlabconfig.py --format=prom-targets \
-          --template_target={{hostname}}:3010 \
-          --label service=ndt_ssl \
-          --label module=tcp_v4_tls_online \
-          --use_flatnames \
-          --select "ndt.iupui.(${!pattern})" > \
-              ${output}/blackbox-targets/ndt_ssl.json
-
-      # NDT SSL on port 3010 over IPv6
-      ./mlabconfig.py --format=prom-targets \
-          --template_target={{hostname}}:3010 \
-          --label service=ndt_ssl_ipv6 \
-          --label module=tcp_v6_tls_online \
-          --label __blackbox_port=${!bbe_port} \
-          --use_flatnames \
-          --select "ndt.iupui.(${!pattern})" \
-          --decoration "v6" > \
-              ${output}/blackbox-targets-ipv6/ndt_ssl_ipv6.json
-
-      # script_exporter for NDT end-to-end monitoring
-      ./mlabconfig.py --format=prom-targets \
-          --template_target={{hostname}} \
-          --label service=ndt_e2e \
-          --use_flatnames \
-          --select "ndt.iupui.(${!pattern})" > \
-              ${output}/script-targets/ndt_e2e.json
-
-      # script_exporter for NDT queueing check
-      ./mlabconfig.py --format=prom-targets \
-          --template_target={{hostname}} \
-          --label service=ndt_queue \
-          --use_flatnames \
-          --select "ndt.iupui.(${!pattern})" > \
-              ${output}/script-targets/ndt_queue.json
-
-      # Mobiperf on ports 6001, 6002, 6003 over IPv4.
-      ./mlabconfig.py --format=prom-targets \
-          --template_target={{hostname}}:6001 \
-          --template_target={{hostname}}:6002 \
-          --template_target={{hostname}}:6003 \
-          --label service=mobiperf \
-          --label module=tcp_v4_online \
-          --physical \
-          --select "1.michigan.(${!pattern})" > \
-              ${output}/blackbox-targets/mobiperf.json
-
-      # Mobiperf on ports 6001, 6002, 6003 over IPv6.
-      ./mlabconfig.py --format=prom-targets \
-          --template_target={{hostname}}:6001 \
-          --template_target={{hostname}}:6002 \
-          --template_target={{hostname}}:6003 \
-          --label service=mobiperf_ipv6 \
-          --label module=tcp_v6_online \
-          --label __blackbox_port=${!bbe_port} \
-          --physical \
-          --select "1.michigan.(${!pattern})" \
-          --decoration "v6" > ${output}/blackbox-targets-ipv6/mobiperf_ipv6.json
-
-      # neubot on port 9773 over IPv4.
-      ./mlabconfig.py --format=prom-targets \
-          --template_target={{hostname}}:9773/sapi/state \
-          --label service=neubot \
-          --label module=neubot_online_v4 \
-          --physical \
-          --select "neubot.mlab.(${!pattern})" > \
-              ${output}/blackbox-targets/neubot.json
-
-      # neubot on port 9773 over IPv6.
-      ./mlabconfig.py --format=prom-targets \
-          --template_target={{hostname}}:9773/sapi/state \
-          --label service=neubot_ipv6 \
-          --label module=neubot_online_v6 \
-          --label __blackbox_port=${!bbe_port} \
-          --physical \
-          --select "neubot.mlab.(${!pattern})" \
-          --decoration "v6" > ${output}/blackbox-targets-ipv6/neubot_ipv6.json
-
-      # snmp_exporter on port 9116.
-      ./mlabconfig.py --format=prom-targets-sites \
-          --physical \
-          --select "${!pattern}" \
-          --template_target=s1.{{sitename}}.measurement-lab.org \
-          --label service=snmp > \
-              ${output}/snmp-targets/snmpexporter.json
-
-      # inotify_exporter for NDT on port 9393.
-      ./mlabconfig.py --format=prom-targets \
-          --template_target={{hostname}}:9393 \
-          --label service=inotify \
-          --physical \
-          --select "ndt.iupui.(${!pattern})" > \
-              ${output}/legacy-targets/ndt_inotify.json
-
-      # node_exporter on port 9100.
-      ./mlabconfig.py --format=prom-targets-nodes \
-          --template_target={{hostname}}:9100 \
-          --label service=nodeexporter \
-          --select "${!pattern}" > \
-              ${output}/legacy-targets/nodeexporter.json
-
-      # ICMP probe for platform switches
-      ./mlabconfig.py --format=prom-targets-sites \
-          --physical \
-          --select "${!pattern}" \
-          --template_target=s1.{{sitename}}.measurement-lab.org \
-          --label module=icmp > \
-              ${output}/blackbox-targets/switches_ping.json
-
-      # SSH on port 22 over IPv4
-      ./mlabconfig.py --format=prom-targets-nodes \
-          --template_target={{hostname}}:22 \
-          --label service=ssh \
-          --label module=ssh_v4_online \
-          --physical \
-          --select "${!pattern}" > ${output}/blackbox-targets/ssh.json
-
-      # SSH on port 22 over IPv6
-      ./mlabconfig.py --format=prom-targets-nodes \
-          --template_target={{hostname}}:22 \
-          --label service=ssh \
-          --label module=ssh_v6_online \
-          --label __blackbox_port=${!bbe_port} \
-          --physical \
-          --select "${!pattern}" \
-          --decoration "v6" > ${output}/blackbox-targets-ipv6/ssh_ipv6.json
-
-    else
-      echo "Unknown group name: ${GROUP} for ${project}"
-    fi
+    # Rsyncd on port 7999.
+    ./legacyconfig.py --format=prom-targets \
+        --template_target={{hostname}}:7999 \
+        --label service=rsyncd \
+        --label module=rsyncd_online \
+        --rsync \
+        --select "${!pattern}" > ${output}/blackbox-targets/rsyncd.json
+
+    # SSH on port 806 over IPv4
+    ./legacyconfig.py --format=prom-targets-nodes \
+        --template_target={{hostname}}:806 \
+        --label service=ssh806 \
+        --label module=ssh_v4_online \
+        --select "${!pattern}" > ${output}/blackbox-targets/ssh806.json
+
+    # SSH on port 806 over IPv6
+    ./legacyconfig.py --format=prom-targets-nodes \
+        --template_target={{hostname}}:806 \
+        --label service=ssh806 \
+        --label module=ssh_v6_online \
+        --label __blackbox_port=${!bbe_port} \
+        --select "${!pattern}" \
+        --decoration "v6" > ${output}/blackbox-targets-ipv6/ssh806_ipv6.json
+
+    # Sidestream exporter in the npad experiment.
+    ./legacyconfig.py --format=prom-targets \
+        --template_target={{hostname}}:9090 \
+        --label service=sidestream \
+        --select "npad.iupui.(${!pattern})" > \
+            ${output}/legacy-targets/sidestream.json
   popd
 done

From a600e9714ef9f3156f3c746df058bed494d08ebb Mon Sep 17 00:00:00 2001
From: Nathan Kinkade <kinkade@measurementlab.net>
Date: Fri, 19 Jul 2019 16:50:26 -0600
Subject: [PATCH 4/5] Renames generate and deploy scripts for Prom targets to
 use name 'scaper' instead of 'legacy' to be more clear.

---
 ..._prometheus_targets.sh => deploy_scraper_prometheus_targets.sh | 0
 ...rometheus_targets.sh => generate_scraper_prometheus_targets.sh | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename deploy_legacy_prometheus_targets.sh => deploy_scraper_prometheus_targets.sh (100%)
 rename generate_legacy_prometheus_targets.sh => generate_scraper_prometheus_targets.sh (100%)

diff --git a/deploy_legacy_prometheus_targets.sh b/deploy_scraper_prometheus_targets.sh
similarity index 100%
rename from deploy_legacy_prometheus_targets.sh
rename to deploy_scraper_prometheus_targets.sh
diff --git a/generate_legacy_prometheus_targets.sh b/generate_scraper_prometheus_targets.sh
similarity index 100%
rename from generate_legacy_prometheus_targets.sh
rename to generate_scraper_prometheus_targets.sh

From 60d2212b4c49d3a5204055d53e7dfebf2ffaa814 Mon Sep 17 00:00:00 2001
From: Nathan Kinkade <kinkade@measurementlab.net>
Date: Fri, 19 Jul 2019 16:51:55 -0600
Subject: [PATCH 5/5] Configures Travis config and deploy script to use new
 names of the scripts.

---
 .travis.yml                          | 6 +++---
 deploy_scraper_prometheus_targets.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index be484da..a6c4eb9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,7 +44,7 @@ deploy:
 ############################################################################
 # Sandbox.
 - provider: script
-  script: $TRAVIS_BUILD_DIR/deploy_legacy_prometheus_targets.sh mlab-sandbox
+  script: $TRAVIS_BUILD_DIR/deploy_scraper_prometheus_targets.sh mlab-sandbox
   skip_cleanup: true
   on:
     repo: m-lab/operator
@@ -54,7 +54,7 @@ deploy:
 ############################################################################
 # Staging, on master.
 - provider: script
-  script: $TRAVIS_BUILD_DIR/deploy_legacy_prometheus_targets.sh mlab-staging
+  script: $TRAVIS_BUILD_DIR/deploy_scraper_prometheus_targets.sh mlab-staging
   skip_cleanup: true
   on:
     repo: m-lab/operator
@@ -63,7 +63,7 @@ deploy:
 ############################################################################
 # Production, on tags.
 - provider: script
-  script: $TRAVIS_BUILD_DIR/deploy_legacy_prometheus_targets.sh mlab-oti
+  script: $TRAVIS_BUILD_DIR/deploy_scraper_prometheus_targets.sh mlab-oti
   skip_cleanup: true
   on:
     repo: m-lab/operator
diff --git a/deploy_scraper_prometheus_targets.sh b/deploy_scraper_prometheus_targets.sh
index fa0fd78..a7a2d6f 100755
--- a/deploy_scraper_prometheus_targets.sh
+++ b/deploy_scraper_prometheus_targets.sh
@@ -14,7 +14,7 @@ SCRIPTDIR=$( dirname "${BASH_SOURCE[0]}" )
 BASEDIR=${PWD}
 
 # Generate the configs.
-${SCRIPTDIR}/generate_legacy_prometheus_targets.sh > /dev/null
+${SCRIPTDIR}/generate_scraper_prometheus_targets.sh > /dev/null
 
 # Be sure that gcloud is PATH
 source "${HOME}/google-cloud-sdk/path.bash.inc"