commit 3344df3690caf6c0cf409068941d752848519bb1
author Ales Komarek <akomarek@mirantis.com> Fri Mar 10 15:18:09 2017 +0000
committer Gerrit Code Review <gerrit2@8d47cb36f245> Fri Mar 10 15:18:09 2017 +0000
tree 44e0e71eca9bb17c0c1f66c2189543bf7a05923c
parent aab6a43e61336c40ec6c9c02e8f7457f79c8c0ea
parent ddccbf694fece656ca713ad002ff5ec52a740005

Merge "Fix processes metrics names"

opencontrail/files/grafana_dashboards/contrail_influxdb.json

diff --git a/opencontrail/files/grafana_dashboards/contrail_influxdb.json b/opencontrail/files/grafana_dashboards/contrail_influxdb.json
index 14c122b..3bdfe8f 100644
--- a/opencontrail/files/grafana_dashboards/contrail_influxdb.json
+++ b/opencontrail/files/grafana_dashboards/contrail_influxdb.json
@@ -1101,7 +1101,7 @@
         },
         {
           "aliasColors": {
-            "lma_components_processes.mean": "#1F78C1"
+            "process_processes.mean": "#1F78C1"
           },
           "bars": false,
           "datasource": null,
@@ -1152,7 +1152,7 @@
                   "type": "fill"
                 }
               ],
-              "measurement": "lma_components_processes",
+              "measurement": "process_processes",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",

opencontrail/meta/heka.yml

diff --git a/opencontrail/meta/heka.yml b/opencontrail/meta/heka.yml
index e88c924..0e00f15 100644
--- a/opencontrail/meta/heka.yml
+++ b/opencontrail/meta/heka.yml
@@ -319,7 +319,7 @@
       description: "There is no {{ contrail_process }} process running"
       severity: down
       rules:
-      - metric: lma_components_processes
+      - metric: process_processes
         field:
           service: {{ contrail_process }}
         relational_operator: '=='
@@ -559,7 +559,7 @@
       description: "There is no {{ contrail_process }} process running"
       severity: down
       rules:
-      - metric: lma_components_processes
+      - metric: process_processes
         field:
           service: {{ contrail_process }}
         relational_operator: '=='
@@ -585,7 +585,7 @@
       description: "There is no {{ contrail_process }} process running"
       severity: down
       rules:
-      - metric: lma_components_processes
+      - metric: process_processes
         field:
           service: {{ contrail_process }}
         relational_operator: '=='
@@ -601,7 +601,7 @@
       description: "There is no {{ contrail_process }} process running"
       severity: down
       rules:
-      - metric: lma_components_processes
+      - metric: process_processes
         field:
           service: {{ contrail_process }}
         relational_operator: '=='