00b40480a3
This fixes the Nagios volume mount for the Elasticsearch query file. Previously, the check for adding the volumemount to the pod definition was incorrect. This fixes the conditional check, and also adds the same conditional check to the configuration secret This adds a simple check to the monitoring and multinode jobs to validate the resulting json gets mounted into the pod successfully Change-Id: I2af289ccc4e1cff1669cb5e6e829514781b14dd3
44 lines
2.0 KiB
YAML
44 lines
2.0 KiB
YAML
{{/*
|
|
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 "configmap_etc._nagios_objects" }}
|
|
{{- tuple "contact" $.Values.conf.nagios.contacts | include "nagios.utils.object_definition" }}
|
|
{{- tuple "contactgroup" $.Values.conf.nagios.contactgroups | include "nagios.utils.object_definition" }}
|
|
{{- tuple "host" $.Values.conf.nagios.hosts | include "nagios.utils.object_definition" }}
|
|
{{- tuple "hostgroup" $.Values.conf.nagios.host_groups | include "nagios.utils.object_definition" }}
|
|
{{- tuple "command" $.Values.conf.nagios.commands | include "nagios.utils.object_definition" }}
|
|
{{- tuple "service" $.Values.conf.nagios.services | include "nagios.utils.object_definition" }}
|
|
{{- end }}
|
|
|
|
{{- if .Values.manifests.configmap_etc }}
|
|
{{- $envAll := . }}
|
|
---
|
|
apiVersion: v1
|
|
kind: Secret
|
|
metadata:
|
|
name: nagios-etc
|
|
type: Opaque
|
|
data:
|
|
cgi.cfg: {{ include "nagios.utils.to_nagios_conf" .Values.conf.nagios.cgi | b64enc }}
|
|
nagios.cfg: {{ include "nagios.utils.to_nagios_conf" .Values.conf.nagios.nagios | b64enc }}
|
|
{{- if not (empty .Values.conf.nagios.query_es_clauses) }}
|
|
query_es_clauses.json: {{ .Values.conf.nagios.query_es_clauses | toJson | b64enc }}
|
|
{{- end }}
|
|
nagios_objects.cfg: {{ include "configmap_etc._nagios_objects" $ | b64enc }}
|
|
#NOTE(portdirect): this must be last, to work round helm ~2.7 bug.
|
|
{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.httpd "key" "httpd.conf" "format" "Secret") | indent 2 }}
|
|
{{- end }}
|