fix(stackdriver): Fixed installer pre-requisites and orca dashboard t…

…ypo. (#49)
spinnaker · Mar 27, 2017 · 5a285fc · 5a285fc
1 parent c0e3bf4
commit 5a285fc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/...er-monitoring-third-party/third_party/stackdriver/clouddriver-microservice-dashboard.json b/...er-monitoring-third-party/third_party/stackdriver/clouddriver-microservice-dashboard.json
@@ -55,7 +55,7 @@
                 "dataSets": [
                   {
                     "timeSeriesFilter": {
-                      "filter": "metric.type=\"custom.googleapis.com/spinnaker/clouddriver/controller.operations__count\" AND metric.label.success=\"true\"",
+                      "filter": "metric.type=\"custom.googleapis.com/spinnaker/clouddriver/operations__count\" AND metric.label.success=\"true\"",
                       "perSeriesAligner": "ALIGN_DELTA"
                     }
                   }

diff --git a/spinnaker-monitoring-third-party/third_party/stackdriver/install.sh b/spinnaker-monitoring-third-party/third_party/stackdriver/install.sh
@@ -56,7 +56,7 @@ function install_server() {
 function install_client() {
   # 20170226
   # Moved this from the daemon requirements for consistency with datadog.
-  pip install -r "$SOURCE_DIR/requirements.txt"
+  pip install -r "$DIRNAME/requirements.txt"
 
   config_path=$(find_config_path)
   if [[ -f "$config_path" ]]; then
@@ -87,6 +87,10 @@ function install_dashboards() {
     exit -1
   fi
 
+  # 20170226
+  # Moved this from the daemon requirements for consistency with datadog.
+  pip install -r "$DIRNAME/requirements.txt"
+
   for dashboard in "$DIRNAME"/*-dashboard.json; do
     "$cli" upload_stackdriver_dashboard --dashboard ${dashboard} "$@"
   done
@@ -108,7 +112,7 @@ if $SERVER; then
 fi
 
 if $DASHBOARDS; then
-  install_dashboards
+  install_dashboards "$@"
 fi
 
 if $CLIENT; then

diff --git a/spinnaker-monitoring-third-party/third_party/stackdriver/orca-microservice-dashboard.json b/spinnaker-monitoring-third-party/third_party/stackdriver/orca-microservice-dashboard.json
@@ -92,7 +92,7 @@
                 "dataSets": [
                   {
                     "timeSeriesFilter": {
-                      "filter": "metric.type=\"custom.googleapis.com/spinnaker/orca/task.invocations\" AND metric.label.executionType=\"Orchestration\" AND metric.label.isComplete!=\"true\"",
+                      "filter": "metric.type=\"custom.googleapis.com/spinnaker/orca/task.invocations\" AND metric.label.executionType=\"Orchestration\" AND metric.label.isComplete=\"false\"",
                       "perSeriesAligner": "ALIGN_SUM"
                     }
                   }
@@ -106,7 +106,7 @@
               }
             },
             {
-              "title": "Sucessful Orchestrations (orca)",
+              "title": "Successful Orchestrations (orca)",
               "xyChart": {
                 "dataSets": [
                   {
@@ -153,7 +153,7 @@
                 "dataSets": [
                   {
                     "timeSeriesFilter": {
-                      "filter": "metric.type=\"custom.googleapis.com/spinnaker/orca/task.invocations\" AND metric.label.executionType=\"Pipeline\" AND metric.label.isComplete!=\"true\"",
+                      "filter": "metric.type=\"custom.googleapis.com/spinnaker/orca/task.invocations\" AND metric.label.executionType=\"Pipeline\" AND metric.label.isComplete=\"false\"",
                       "perSeriesAligner": "ALIGN_SUM"
                     }
                   }
@@ -167,7 +167,7 @@
               }
             },
             {
-              "title": "Sucessful Pipelines (orca)",
+              "title": "Successful Pipelines (orca)",
               "xyChart": {
                 "dataSets": [
                   {