openstack/openstack-helm-infra
Code Issues Proposed changes

Nagios: update functions to live in correct locations

Browse Source 
This PS simply moves functions within the chart to their correct location.

Change-Id: Ia3d693713903d226a864dcdcf9884dee67f07d2b
Signed-off-by: Pete Birley <pete@port.direct>
This commit is contained in:
Pete Birley 2018-06-11 22:14:44 -05:00
parent 3470b17fc8
commit c48e47b47a
3 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nagios/templates/configmap-etc.yaml
View File

@ -27,14 +27,14 @@ data:
nagios-host.conf: | nagios-host.conf: |
{{- tuple .Values.conf.apache.host "etc/_nagios-host.conf.tpl" . | include "helm-toolkit.utils.configmap_templater" }} {{- tuple .Values.conf.apache.host "etc/_nagios-host.conf.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
cgi.cfg: |+ cgi.cfg: |+
{{ include "nagios.to_nagios_conf" .Values.conf.nagios.cgi | indent 4 }} {{ include "nagios.utils.to_nagios_conf" .Values.conf.nagios.cgi | indent 4 }}
nagios.cfg: |+ nagios.cfg: |+
{{ include "nagios.to_nagios_conf" .Values.conf.nagios.nagios | indent 4 }} {{ include "nagios.utils.to_nagios_conf" .Values.conf.nagios.nagios | indent 4 }}
nagios_objects.cfg: |+ nagios_objects.cfg: |+
{{- tuple "contact" .Values.conf.nagios.contacts | include "nagios.object_definition" | indent 4 }} {{- tuple "contact" .Values.conf.nagios.contacts | include "nagios.utils.object_definition" | indent 4 }}
{{- tuple "contactgroup" .Values.conf.nagios.contactgroups | include "nagios.object_definition" | indent 4 }} {{- tuple "contactgroup" .Values.conf.nagios.contactgroups | include "nagios.utils.object_definition" | indent 4 }}
{{- tuple "host" .Values.conf.nagios.hosts | include "nagios.object_definition" | indent 4 }} {{- tuple "host" .Values.conf.nagios.hosts | include "nagios.utils.object_definition" | indent 4 }}
{{- tuple "hostgroup" .Values.conf.nagios.host_groups | include "nagios.object_definition" | indent 4 }} {{- tuple "hostgroup" .Values.conf.nagios.host_groups | include "nagios.utils.object_definition" | indent 4 }}
{{- tuple "command" .Values.conf.nagios.commands | include "nagios.object_definition" | indent 4 }} {{- tuple "command" .Values.conf.nagios.commands | include "nagios.utils.object_definition" | indent 4 }}
{{- tuple "service" .Values.conf.nagios.services | include "nagios.object_definition" | indent 4 }} {{- tuple "service" .Values.conf.nagios.services | include "nagios.utils.object_definition" | indent 4 }}
{{- end }} {{- end }}

14
nagios/templates/_helpers.tpl → nagios/templates/utils/_object_definition.tpl
View File

@ -14,7 +14,7 @@ limitations under the License.
# This function defines commands, hosts, hostgroups, and services for nagios by # This function defines commands, hosts, hostgroups, and services for nagios by
# consuming yaml trees to define the fields for these objects # consuming yaml trees to define the fields for these objects
{{- define "nagios.object_definition" -}} {{- define "nagios.utils.object_definition" -}}
{{- $type := index . 0 }} {{- $type := index . 0 }}
{{- $objects := index . 1 }} {{- $objects := index . 1 }}
{{- range $object := $objects }} {{- range $object := $objects }}
@ -27,15 +27,3 @@ define {{ $type }} {
{{end -}} {{end -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{- define "nagios.to_nagios_conf" -}}
{{- range $key, $value := . -}}
{{ if eq $key "cfg_file" }}
{{ range $file := $value -}}
{{ $key }}={{ $file }}
{{ end }}
{{- else }}
{{ $key }}={{ $value }}
{{- end }}
{{- end -}}
{{- end -}}

24
nagios/templates/utils/_to_nagios_conf.tpl Normal file
View File

@ -0,0 +1,24 @@
{{/*
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.
*/}}
{{- define "nagios.utils.to_nagios_conf" -}}
{{- range $key, $value := . -}}
{{ if eq $key "cfg_file" }}
{{ range $file := $value -}}
{{ $key }}={{ $file }}
{{ end }}
{{- else }}
{{ $key }}={{ $value }}
{{- end }}
{{- end -}}
{{- end -}}