Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow independent installation of grafana and prometheus #2057

Merged
merged 2 commits into from
Aug 27, 2020
Merged

allow independent installation of grafana and prometheus #2057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe2ae12
allow independent installation of grafana and prometheus
dewnull Jul 1, 2020
c9c0de5
add .enabled to grafana and prometheus
dewnull Jul 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...-charts/seldon-core-analytics/templates/grafana/grafana-net-2115-dashboard-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- if .Values.grafana.enabled }}
apiVersion: v1
data:
{{ (.Files.Glob "files/grafana/configs/grafana-net-2115-dashboard.json").AsConfig | indent 2 }}
Expand All @@ -8,3 +9,4 @@ metadata:
namespace: {{ .Release.Namespace }}
labels:
seldon_dashboard: "1"
{{- end }}
2 changes: 2 additions & 0 deletions helm-charts/seldon-core-analytics/templates/grafana/metrics-test-dashboard-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- if .Values.grafana.enabled }}
apiVersion: v1
data:
{{ (.Files.Glob "files/grafana/configs/metrics-test-dashboard.json").AsConfig | indent 2 }}
Expand All @@ -8,3 +9,4 @@ metadata:
namespace: {{ .Release.Namespace }}
labels:
seldon_dashboard: "1"
{{- end }}
2 changes: 2 additions & 0 deletions helm-charts/seldon-core-analytics/templates/grafana/newdb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- if .Values.grafana.enabled }}
apiVersion: v1
data:
{{ (.Files.Glob "files/grafana/configs/newdb.json").AsConfig | indent 2 }}
Expand All @@ -8,3 +9,4 @@ metadata:
namespace: {{ .Release.Namespace }}
labels:
seldon_dashboard: "1"
{{- end }}
2 changes: 2 additions & 0 deletions ...rts/seldon-core-analytics/templates/grafana/prediction-analytics-dashboard-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- if .Values.grafana.enabled }}
apiVersion: v1
data:
{{ (.Files.Glob "files/grafana/configs/predictions-analytics-dashboard.json").AsConfig | indent 2 }}
Expand All @@ -8,3 +9,4 @@ metadata:
namespace: {{ .Release.Namespace }}
labels:
seldon_dashboard: "1"
{{- end }}
2 changes: 2 additions & 0 deletions helm-charts/seldon-core-analytics/templates/prometheus/alertmanager-config-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- if .Values.prometheus.enabled }}
apiVersion: v1
data:
{{- if .Values.alertmanager.config.enabled }}
Expand All @@ -19,3 +20,4 @@ metadata:
creationTimestamp: null
name: alertmanager-server-conf
namespace: {{ .Release.Namespace }}
{{- end }}
2 changes: 2 additions & 0 deletions helm-charts/seldon-core-analytics/templates/prometheus/prometheus-rules-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- if .Values.prometheus.enabled }}
apiVersion: v1
data:
{{ (.Files.Glob "files/prometheus/rules/*.rules").AsConfig | indent 2 }}
Expand All @@ -6,3 +7,4 @@ metadata:
creationTimestamp: null
name: prometheus-rules
namespace: {{ .Release.Namespace }}
{{- end }}
2 changes: 2 additions & 0 deletions helm-charts/seldon-core-analytics/templates/prometheus/prometheus-server-conf-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- if .Values.prometheus.enabled }}
apiVersion: v1
data:
{{ (.Files.Glob "files/prometheus/prometheus-config.yaml").AsConfig | indent 2 }}
Expand All @@ -6,3 +7,4 @@ metadata:
creationTimestamp: null
name: prometheus-server-conf
namespace: {{ .Release.Namespace }}
{{- end }}
2 changes: 2 additions & 0 deletions helm-charts/seldon-core-analytics/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
grafana:
enabled: true
adminUser: admin
adminPassword: password
sidecar:
Expand All @@ -19,6 +20,7 @@ alertmanager:
rbac:
enabled: true
prometheus:
enabled: true
service_type: ClusterIP
server:
name: seldon
Expand Down