AETHER-2529 aether-roc-umbrella 3 prometheus and 2 prom-label-proxy
Change-Id: I01c4f60bfa265156cda88ffa1e8b73c5232c22d8
diff --git a/aether-roc-gui-v4/Chart.yaml b/aether-roc-gui-v4/Chart.yaml
index aa192c9..2e75cc7 100644
--- a/aether-roc-gui-v4/Chart.yaml
+++ b/aether-roc-gui-v4/Chart.yaml
@@ -7,7 +7,7 @@
description: Aether ROC Graphical User Interface
kubeVersion: ">=1.15.0"
type: application
-version: 4.0.4
+version: 4.0.5
appVersion: 4.0.0
keywords:
- aether
diff --git a/aether-roc-gui-v4/templates/configmap.yaml b/aether-roc-gui-v4/templates/configmap.yaml
index 4646f9c..0cf6ad2 100644
--- a/aether-roc-gui-v4/templates/configmap.yaml
+++ b/aether-roc-gui-v4/templates/configmap.yaml
@@ -38,9 +38,23 @@
proxy_hide_header 'X-Frame-Options';
add_header X-Frame-Options SAMEORIGIN;
}{{end}}
- {{- if .Values.prometheus.proxyEnabled }}
- location /prometheus/ {
- proxy_pass {{ .Values.prometheus.protocol }}://{{ .Values.prometheus.service }}:{{ .Values.prometheus.port }}/;
+ {{- if .Values.prometheus.acc.proxyEnabled }}
+ location /prometheus-acc/ {
+ proxy_pass {{ .Values.prometheus.acc.protocol }}://{{ .Values.prometheus.acc.service }}:{{ .Values.prometheus.acc.port }}/;
+ proxy_http_version 1.1;
+ proxy_set_header Upgrade $http_upgrade;
+ add_header X-Frame-Options SAMEORIGIN;
+ }{{end}}
+ {{- if .Values.prometheus.amp.proxyEnabled }}
+ location /prometheus-amp/ {
+ proxy_pass {{ .Values.prometheus.amp.protocol }}://{{ .Values.prometheus.amp.service }}:{{ .Values.prometheus.amp.port }}/;
+ proxy_http_version 1.1;
+ proxy_set_header Upgrade $http_upgrade;
+ add_header X-Frame-Options SAMEORIGIN;
+ }{{end}}
+ {{- range $siteid, $site := .Values.prometheus.site }}
+ location /prometheus-{{$site.name}}/ {
+ proxy_pass {{ $site.protocol }}://{{ $site.service }}:{{ $site.port }}/;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
add_header X-Frame-Options SAMEORIGIN;
diff --git a/aether-roc-gui-v4/values.yaml b/aether-roc-gui-v4/values.yaml
index eb96b13..a590476 100644
--- a/aether-roc-gui-v4/values.yaml
+++ b/aether-roc-gui-v4/values.yaml
@@ -77,10 +77,17 @@
port: 80
prometheus:
- proxyEnabled: false
- service: prometheus
- protocol: http
- port: 80
+ acc:
+ proxyEnabled: false
+ service: prometheus-acc
+ protocol: http
+ port: 80
+ amp:
+ proxyEnabled: false
+ service: prometheus-amp
+ protocol: http
+ port: 80
+ site: []
Nginx:
port: 80