Unverified Commit 029be1e8 authored by Denise's avatar Denise Committed by GitHub
Browse files

Merge pull request #95 from ekristen/feature/thanos-support 

Feature: thanos support
parents 39571689 474375ed

charts/rancher-monitoring/v0.0.7/charts/prometheus/templates/prometheus.yaml

+9 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ spec: 
    image: {{ template "system_default_registry" . }}{{ .Values.image.proxy.repository }}:{{ .Values.image.proxy.tag }}

    ports:

    - containerPort: 8080

      name: http

      name: nginx-http

      protocol: TCP

    {{- if and .Values.resources .Values.resources.proxy }}

    resources:
@@ -107,6 +107,14 @@ spec: 
{{- range $key, $value := .Values.externalLabels}}

    {{ $key }}: {{ $value | quote }}

{{- end }}

{{- end }}

{{- if .Values.thanos.enabled }}

  thanos: 

    baseImage: {{ template "system_default_registry" . }}{{ .Values.image.thanos.repository }}

    version: {{ .Values.image.thanos.tag }}

    objectStorageConfig:

      key: thanos.yaml

      name: {{ template "app.thanos.fullname" . }}

{{- end }}

  nodeSelector:

{{- include "linux-node-selector" . | nindent 4 }}

charts/rancher-monitoring/v0.0.7/charts/prometheus/templates/secrets.yaml

+17 −1
Original line number Diff line number Diff line
@@ -26,3 +26,19 @@ metadata: 
stringData:

  additional-alertmanager-configs.yaml: {{ template "additional-alertmanager-configs.yaml" . }}

{{- end }}



{{- if .Values.thanos.enabled }} 

---

apiVersion: v1

kind: Secret

metadata:

  name: {{ template "app.thanos.fullname" . }}

  labels:

    app: {{ template "app.name" . }}

    chart: {{ template "app.version" . }}

    heritage: {{ .Release.Service }}

    release: {{ .Release.Name }}

stringData:

  thanos.yaml: |-

{{ toYaml .Values.thanos.objectConfig | indent 6 }}

{{- end }}

charts/rancher-monitoring/v0.0.7/charts/prometheus/templates/service.yaml

+30 −2
Original line number Diff line number Diff line
@@ -16,6 +16,34 @@ spec: 
    chart: {{ template "app.version" . }}

    release: {{ .Release.Name }}

  ports:

    - name: http

    - name: nginx-http

      port: 80

      targetPort: http
 
      targetPort: nginx-http



{{- if .Values.thanos.enabled }} 

---

apiVersion: v1

kind: Service

metadata:

  name: access-thanos

  labels:

    app: {{ template "app.name" . }}

    chart: {{ template "app.version" . }}

    heritage: {{ .Release.Service }}

    release: {{ .Release.Name }}

    kubernetes.io/cluster-service: "true"

spec:

  type: ClusterIP

  sessionAffinity: ClientIP

  selector:

    app: {{ template "app.name" . }}

    chart: {{ template "app.version" . }}

    release: {{ .Release.Name }}

  ports:

    - name: thanos-grpc

      port: 10901

      targetPort: 10901

    - name: thanos-http

      port: 10902

      targetPort: 10902

{{- end }}

charts/rancher-monitoring/v0.0.7/charts/prometheus/values.yaml

+6 −0
Original line number Diff line number Diff line
@@ -75,3 +75,9 @@ additionalAlertManagerConfigs: [] 
istioMonitoring:

  enabled: true

  namespace: istio-system



thanos:

  enabled: false

  ## ObjectStoreConfig

  ## Ref: https://github.com/thanos-io/thanos/blob/master/docs/storage.md

  objectConfig: {}

charts/rancher-monitoring/v0.0.7/templates/_helpers.tpl

+4 −0
Original line number Diff line number Diff line
@@ -56,6 +56,10 @@ 
{{- printf "%s-%s-cleanup" $name .Release.Name -}}

{{- end -}}



{{- define "app.thanos.fullname" -}}

{{- $name := include "app.name" . -}}

{{- printf "%s-%s-thanos" $name .Release.Name -}}

{{- end -}}



{{- define "kube_version" -}}

{{- printf "%s.%s" .Capabilities.KubeVersion.Major .Capabilities.KubeVersion.Minor -}}