openstack/openstack-helm-infra
Code Issues Proposed changes

Helm-Toolkit: Split prom pod annotations templates into files

Browse Source 
This PS splits the `prometheus_pod_annotations.tpl` into seperate
files for each definition contained within it to be consistent
with other funstions in Helm-Toolkit, which can be located by path
from their name.

Change-Id: Ief9e31ead7eb1028cedd8e608d6b11e53e63e515
This commit is contained in:
portdirect 2017-12-19 20:24:39 -05:00
parent 770a53521d
commit c11c45dda7
2 changed files with 30 additions and 15 deletions

30
helm-toolkit/templates/snippets/_prometheus_pod_annotations.tpl Normal file

@ -0,0 +1,30 @@
{{/*
Copyright 2017 The Openstack-Helm Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/}}
# Appends annotations for configuring prometheus scrape jobs via pod
# annotations. The required annotations are:
# * `prometheus.io/scrape`: Only scrape pods that have a value of `true`
# * `prometheus.io/path`: If the metrics path is not `/metrics` override this.
# * `prometheus.io/port`: Scrape the pod on the indicated port instead of the
# pod's declared ports (default is a port-free target if none are declared).
{{- define "helm-toolkit.snippets.prometheus_pod_annotations" -}}
{{- $pod := index . 0 -}}
{{- $context := index . 1 -}}
prometheus.io/scrape: {{ $pod.scrape | quote }}
prometheus.io/path: {{ $pod.path.default | quote }}
prometheus.io/port: {{ $pod.scrape_port | quote }}
{{- end -}}

15
helm-toolkit/templates/snippets/_prometheus_metadata_annotations.tpl → helm-toolkit/templates/snippets/_prometheus_service_annotations.tpl

@ -31,18 +31,3 @@ prometheus.io/scheme: {{ $endpoint.scheme.default | quote }}
prometheus.io/path: {{ $endpoint.path.default | quote }}
prometheus.io/port: {{ $endpoint.scrape_port | quote }}
{{- end -}}
# Appends annotations for configuring prometheus scrape jobs via pod
# annotations. The required annotations are:
# * `prometheus.io/scrape`: Only scrape pods that have a value of `true`
# * `prometheus.io/path`: If the metrics path is not `/metrics` override this.
# * `prometheus.io/port`: Scrape the pod on the indicated port instead of the
# pod's declared ports (default is a port-free target if none are declared).
{{- define "helm-toolkit.snippets.prometheus_pod_annotations" -}}
{{- $pod := index . 0 -}}
{{- $context := index . 1 -}}
prometheus.io/scrape: {{ $pod.scrape | quote }}
prometheus.io/path: {{ $pod.path.default | quote }}
prometheus.io/port: {{ $pod.scrape_port | quote }}
{{- end -}}