Paramaterize Prometheus integration test to use for local testing (#928)

m3db · Sep 21, 2018 · b2d4ba4 · b2d4ba4
1 parent bf62df3
commit b2d4ba4
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 47 deletions.
diff --git a/scripts/integration-tests/prometheus/docker-compose.yml b/scripts/integration-tests/prometheus/docker-compose.yml
@@ -38,5 +38,13 @@ services:
     image: prom/prometheus:latest
     volumes:
       - "./:/etc/prometheus/"
+  grafana:
+    expose:
+      - "3000"
+    ports:
+      - "0.0.0.0:3000:3000"
+    networks:
+      - backend
+    image: grafana/grafana:latest
 networks:
   backend:
diff --git a/scripts/integration-tests/prometheus/prometheus-integration-test.sh b/scripts/integration-tests/prometheus/prometheus-integration-test.sh
@@ -5,9 +5,16 @@ set -xe
 rm -rf /tmp/m3dbdata/
 mkdir -p /tmp/m3dbdata/
 
-echo "Build docker images"
+PARAM_TEST_BUILD="${TEST_BUILD:-true}"
+PARAM_TEST_VERIFY="${TEST_VERIFY:-true}"
+PARAM_TEST_TEARDOWN="${TEST_TEARDOWN:-true}"
 
-docker-compose -f docker-compose.yml build
+if [ $PARAM_TEST_BUILD != "true" ]; then
+  echo "SKIP build docker images"
+else
+  echo "Build docker images"
+  docker-compose -f docker-compose.yml build
+fi
 
 echo "Run m3dbnode and m3coordinator containers"
 
@@ -78,56 +85,61 @@ echo "Start Prometheus container"
 
 docker-compose -f docker-compose.yml up -d prometheus01
 
-sleep 10
-
-echo "Write data"
-
-curl -vvvsSf -X POST localhost:9003/writetagged -d '{
-  "namespace": "prometheus_metrics",
-  "id": "foo",
-  "tags": [
-    {
-      "name": "city",
-      "value": "new_york"
-    },
-    {
-      "name": "endpoint",
-      "value": "/request"
+if [ $PARAM_TEST_VERIFY != "true" ]; then
+  echo "SKIP verify"
+else
+  echo "Write direct test data"
+
+  curl -vvvsSf -X POST localhost:9003/writetagged -d '{
+    "namespace": "prometheus_metrics",
+    "id": "foo",
+    "tags": [
+      {
+        "name": "city",
+        "value": "new_york"
+      },
+      {
+        "name": "endpoint",
+        "value": "/request"
+      }
+    ],
+    "datapoint": {
+      "timestamp":'"$(date +"%s")"',
+      "value": 42.123456789
     }
-  ],
-  "datapoint": {
-    "timestamp":'"$(date +"%s")"',
-    "value": 42.123456789
-  }
-}'
+  }'
 
-echo "Read data"
+  echo "Read direct test data"
 
-queryResult=$(curl -sSf -X POST localhost:9003/query -d '{
-  "namespace": "prometheus_metrics",
-  "query": {
-    "regexp": {
-      "field": "city",
-      "regexp": ".*"
-    }
-  },
-  "rangeStart": 0,
-  "rangeEnd":'"$(date +"%s")"'
-}' | jq '.results | length')
-
-if [ "$queryResult" -lt 1 ]; then
-  echo "Result not found"
-  exit 1
-else
-  echo "Result found"
-fi
+  queryResult=$(curl -sSf -X POST localhost:9003/query -d '{
+    "namespace": "prometheus_metrics",
+    "query": {
+      "regexp": {
+        "field": "city",
+        "regexp": ".*"
+      }
+    },
+    "rangeStart": 0,
+    "rangeEnd":'"$(date +"%s")"'
+  }' | jq '.results | length')
 
-echo "Sleep for 30 seconds to let the remote write endpoint generate some data"
+  if [ "$queryResult" -lt 1 ]; then
+    echo "Result not found"
+    exit 1
+  else
+    echo "Result found"
+  fi
 
-sleep 30
+  echo "Sleep for 30 seconds to let the remote write endpoint generate some data"
 
-# Ensure Prometheus can proxy a Prometheus query
-[ "$(curl -sSf localhost:9090/api/v1/query?query=prometheus_remote_storage_succeeded_samples_total | jq .data.result[].value[1])" != '"0"' ]
+  sleep 30
 
+  # Ensure Prometheus can proxy a Prometheus query
+  [ "$(curl -sSf localhost:9090/api/v1/query?query=prometheus_remote_storage_succeeded_samples_total | jq .data.result[].value[1])" != '"0"' ]
+fi
 
-docker-compose -f docker-compose.yml down || echo "unable to shutdown containers" # CI fails to stop all containers sometimes
+if [ $PARAM_TEST_TEARDOWN != "true" ]; then
+  echo "SKIP teardown"
+else
+  docker-compose -f docker-compose.yml down || echo "unable to shutdown containers" # CI fails to stop all containers sometimes
+fi
diff --git a/scripts/integration-tests/prometheus/prometheus.yml b/scripts/integration-tests/prometheus/prometheus.yml
@@ -34,6 +34,10 @@ scrape_configs:
     static_configs:
       - targets: ['coordinator01:7203']
 
+  - job_name: 'dbnode'
+      static_configs:
+        - targets: ['dbnode01:9004']
+
 remote_read:
   - url: http://coordinator01:7201/api/v1/prom/remote/read