Merge "add changes for opencontrail"
diff --git a/kubernetes/files/grafana_dashboards/kubernetes_cluster_prometheus.json b/kubernetes/files/grafana_dashboards/kubernetes_cluster_prometheus.json
index 5fb93c1..05ef642 100644
--- a/kubernetes/files/grafana_dashboards/kubernetes_cluster_prometheus.json
+++ b/kubernetes/files/grafana_dashboards/kubernetes_cluster_prometheus.json
@@ -331,7 +331,7 @@
},
"targets": [
{
- "expr": "sum (container_fs_usage_bytes{device=~\"^/dev/[sv]da9$\",id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}) / sum (container_fs_limit_bytes{device=~\"^/dev/[sv]da9$\",id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}) * 100",
+ "expr": "sum (container_fs_usage_bytes{device=~\"^/dev/[sv]da\\\\d*$\",id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}) / sum (container_fs_limit_bytes{device=~\"^/dev/[sv]da\\\\d*$\",id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}) * 100",
"interval": "10s",
"intervalFactor": 1,
"legendFormat": "",
@@ -723,7 +723,7 @@
},
"targets": [
{
- "expr": "sum (container_fs_usage_bytes{device=~\"^/dev/[sv]da9$\",id=\"/\",kubernetes_io_hostname=~\"^$Node$\"})",
+ "expr": "sum (container_fs_usage_bytes{device=~\"^/dev/[sv]da\\\\d*$\",id=\"/\",kubernetes_io_hostname=~\"^$Node$\"})",
"interval": "10s",
"intervalFactor": 1,
"refId": "A",
@@ -801,7 +801,7 @@
},
"targets": [
{
- "expr": "sum (container_fs_limit_bytes{device=~\"^/dev/[sv]da9$\",id=\"/\",kubernetes_io_hostname=~\"^$Node$\"})",
+ "expr": "sum (container_fs_limit_bytes{device=~\"^/dev/[sv]da\\\\d*$\",id=\"/\",kubernetes_io_hostname=~\"^$Node$\"})",
"interval": "10s",
"intervalFactor": 1,
"refId": "A",
diff --git a/metadata/service/master/cluster.yml b/metadata/service/master/cluster.yml
index bba8867..3cb4c03 100644
--- a/metadata/service/master/cluster.yml
+++ b/metadata/service/master/cluster.yml
@@ -20,6 +20,8 @@
insecure_address: 127.0.0.1
insecure_port: 8080
count: 3
+ daemon_opts:
+ anonymous-auth: false
etcd:
members:
- host: ${_param:cluster_node01_address}
diff --git a/metadata/service/master/single.yml b/metadata/service/master/single.yml
index 4a52299..a8bc63a 100644
--- a/metadata/service/master/single.yml
+++ b/metadata/service/master/single.yml
@@ -19,6 +19,8 @@
address: ${_param:single_address}
insecure_address: 127.0.0.1
insecure_port: 8080
+ daemon_opts:
+ anonymous-auth: false
etcd:
members:
- host: ${_param:single_address}