EDGEPOD-84 Run Prometheus and Grafana behind the reverse proxy
Also fixed some cluster configurations
Change-Id: Ifd48f9d03355864db69aa9ebe07ac5a7c733a31d
diff --git a/deployment-configs/aether/clusters/production-azure-central.yml b/deployment-configs/aether/clusters/production-central-azure.yml
similarity index 93%
rename from deployment-configs/aether/clusters/production-azure-central.yml
rename to deployment-configs/aether/clusters/production-central-azure.yml
index 2f1e45f..1573430 100644
--- a/deployment-configs/aether/clusters/production-azure-central.yml
+++ b/deployment-configs/aether/clusters/production-central-azure.yml
@@ -1,4 +1,4 @@
-name: production-azure-central
+name: production-central-azure
rancher_kubernetes_engine_config:
authentication:
strategy: x509
@@ -76,11 +76,6 @@
reload
loadbalance
}
- mwc.edge:53 {
- errors
- cache 30
- forward . 10.54.128.10
- }
windows_prefered_cluster: false
docker_root_dir: /var/lib/docker
diff --git a/deployment-configs/aether/clusters/production-gcp-central.yml b/deployment-configs/aether/clusters/production-central-gcp.yml
similarity index 90%
rename from deployment-configs/aether/clusters/production-gcp-central.yml
rename to deployment-configs/aether/clusters/production-central-gcp.yml
index 5360c1c..ac9b33e 100644
--- a/deployment-configs/aether/clusters/production-gcp-central.yml
+++ b/deployment-configs/aether/clusters/production-central-gcp.yml
@@ -1,4 +1,4 @@
-name: production-central
+name: production-central-gcp
rancher_kubernetes_engine_config:
authentication:
strategy: x509
@@ -96,16 +96,6 @@
reload
loadbalance
}
- menlo.edge:53 {
- errors
- cache 30
- forward . 10.53.128.10
- }
- mwc.edge:53 {
- errors
- cache 30
- forward . 10.54.128.10
- }
windows_prefered_cluster: false
docker_root_dir: /var/lib/docker
diff --git a/deployment-configs/aether/clusters/production-global.yml b/deployment-configs/aether/clusters/production-global.yml
index 5b1a6bc..82c9d92 100644
--- a/deployment-configs/aether/clusters/production-global.yml
+++ b/deployment-configs/aether/clusters/production-global.yml
@@ -93,30 +93,30 @@
cache 30
forward . 10.52.128.10
}
- staging.central:53 {
+ azure.central:53 {
errors
cache 30
- forward . 10.47.128.10
+ forward . 10.55.128.10
}
menlo.edge:53 {
errors
cache 30
forward . 10.53.128.10
}
- a.staging.edge:53 {
+ tucson.edge:53 {
errors
cache 30
- forward . 10.48.128.10
+ forward . 10.59.128.10
}
- b.staging.edge:53 {
+ intel.edge:53 {
errors
cache 30
- forward . 10.49.128.10
+ forward . 10.212.74.138
}
- c.staging.edge:53 {
+ ntt.edge:53 {
errors
cache 30
- forward . 10.50.128.10
+ forward . 10.80.128.10
}
windows_prefered_cluster: false
diff --git a/deployment-configs/aether/clusters/staging-central.yml b/deployment-configs/aether/clusters/staging-central.yml
index 30ca92e..f203eeb 100644
--- a/deployment-configs/aether/clusters/staging-central.yml
+++ b/deployment-configs/aether/clusters/staging-central.yml
@@ -1,4 +1,4 @@
-name: staging-central
+name: staging-central-gcp
rancher_kubernetes_engine_config:
authentication:
strategy: x509
@@ -96,21 +96,6 @@
reload
loadbalance
}
- a.staging.edge:53 {
- errors
- cache 30
- forward . 10.48.128.10
- }
- b.staging.edge:53 {
- errors
- cache 30
- forward . 10.49.128.10
- }
- c.staging.edge:53 {
- errors
- cache 30
- forward . 10.50.128.10
- }
windows_prefered_cluster: false
docker_root_dir: /var/lib/docker
diff --git a/deployment-configs/aether/clusters/staging-edge-onf-menlo.yml b/deployment-configs/aether/clusters/staging-edge-onf-menlo.yml
index b4d8774..a5f95ef 100644
--- a/deployment-configs/aether/clusters/staging-edge-onf-menlo.yml
+++ b/deployment-configs/aether/clusters/staging-edge-onf-menlo.yml
@@ -79,10 +79,10 @@
reload
loadbalance
}
- product.central:53 {
+ staging.central:53 {
errors
cache 30
- forward . 10.52.128.10
+ forward . 10.47.128.10
}
aetherproject.net {
hosts {