Merge "Add Salt 2018.3 tests"
diff --git a/debian/control b/debian/control
index f089d84..6ddd198 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@
Maintainer: Ilya Kharin <ikharin@mirantis.com>
Section: admin
Priority: optional
-Build-Depends: debhelper (>= 9), salt-master, python, python-yaml
+Build-Depends: debhelper (>= 9), python, python-yaml
Standards-Version: 3.9.6
Homepage: http://mirantis.com
Vcs-Browser: https://github.com/salt-formulas/salt-formula-devops-portal
diff --git a/devops_portal/files/grafana_dashboards/cloud_usage_dashboard.json b/devops_portal/files/grafana_dashboards/cloud_usage_dashboard.json
index 8c2e07c..43f28c9 100644
--- a/devops_portal/files/grafana_dashboards/cloud_usage_dashboard.json
+++ b/devops_portal/files/grafana_dashboards/cloud_usage_dashboard.json
@@ -393,7 +393,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "count(system_uptime{host=~\"cmp.*\"})",
+ "expr": "count(openstack_nova_service{service=\"nova-compute\"})",
"format": "time_series",
"intervalFactor": 2,
"refId": "A",
diff --git a/devops_portal/files/grafana_dashboards/csm_dashboard.json b/devops_portal/files/grafana_dashboards/csm_dashboard.json
index 2deecc6..b9ff70b 100644
--- a/devops_portal/files/grafana_dashboards/csm_dashboard.json
+++ b/devops_portal/files/grafana_dashboards/csm_dashboard.json
@@ -773,7 +773,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "count(system_uptime{host=~\"cmp.*\"})",
+ "expr": "count(openstack_nova_service{service=\"nova-compute\"})",
"format": "time_series",
"intervalFactor": 2,
"refId": "A",
diff --git a/devops_portal/files/grafana_dashboards/csm_dashboard_fluentd.json b/devops_portal/files/grafana_dashboards/csm_dashboard_fluentd.json
index 84b731a..c4d28e3 100644
--- a/devops_portal/files/grafana_dashboards/csm_dashboard_fluentd.json
+++ b/devops_portal/files/grafana_dashboards/csm_dashboard_fluentd.json
@@ -773,7 +773,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "count(system_uptime{host=~\"cmp.*\"})",
+ "expr": "count(openstack_nova_service{service=\"nova-compute\"})",
"format": "time_series",
"intervalFactor": 2,
"refId": "A",
diff --git a/devops_portal/files/grafana_dashboards/openstack_availability.json b/devops_portal/files/grafana_dashboards/openstack_availability.json
index 828e970..c78425a 100644
--- a/devops_portal/files/grafana_dashboards/openstack_availability.json
+++ b/devops_portal/files/grafana_dashboards/openstack_availability.json
@@ -773,7 +773,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "count(system_uptime{host=~\"cmp.*\"})",
+ "expr": "count(openstack_nova_service{service=\"nova-compute\"})",
"format": "time_series",
"intervalFactor": 2,
"refId": "A",
diff --git a/devops_portal/files/grafana_dashboards/openstack_availability_fluentd.json b/devops_portal/files/grafana_dashboards/openstack_availability_fluentd.json
index 064ed73..01c4e5e 100644
--- a/devops_portal/files/grafana_dashboards/openstack_availability_fluentd.json
+++ b/devops_portal/files/grafana_dashboards/openstack_availability_fluentd.json
@@ -773,7 +773,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "count(system_uptime{host=~\"cmp.*\"})",
+ "expr": "count(openstack_nova_service{service=\"nova-compute\"})",
"format": "time_series",
"intervalFactor": 2,
"refId": "A",