Merge pull request #42 from Icinga/product-names

Fix product names

CONTRIBUTING.md

@@ -37,5 +37,5 @@ To maintain a certain style of tests throughout the charts, please adhere to the
 
 * Tests for subcharts should be placed in the `./tests` directory of the parent chart and prefixed with the subchart's name, e.g. `icingaweb2_deployment_test.yaml`.
 * Tests should be grouped by the template they are testing.
-* Test files should be named after the template they are testing, e.g. IcingaWeb2's `deployment.yaml` should be tested in `icingaweb2_deployment_test.yaml`.
-* **Test Suites** should be prefixed with the name of the chart they test, e.g. *[Icinga2] Test Icinga2 persistence*
+* Test files should be named after the template they are testing, e.g. Icinga Web's `deployment.yaml` should be tested in `icingaweb2_deployment_test.yaml`.
+* **Test Suites** should be prefixed with the name of the product/chart they test, e.g. *[Icinga 2] Test Icinga 2 persistence*

README.md

@@ -1,17 +1,17 @@
-# Icinga2 Kubernetes Helm Charts
+# Icinga Kubernetes Helm Charts
 
-This repository serves as a central repository to host all Icinga2 related Helm charts.
+This repository serves as a central repository to host all Icinga related Helm charts.
 
-[Icinga2](https://icinga.com) is a monitoring system which checks the availability of your network resources, notifies users of outages, and generates performance data for reporting.
+[Icinga](https://icinga.com) is a monitoring system which checks the availability of your network resources, notifies users of outages, and generates performance data for reporting.
 
 [Helm](https://helm.sh) is a tool for managing Kubernetes charts. Charts are packages of pre-configured Kubernetes resources.
 
 ### Add Helm repository
 
-First you need to add the Icinga2 Helm repository to your Helm installation. Helm repositories are similar to package repositories in Linux distributions as in they contain different available packages of 
+First you need to add the Icinga Helm repository to your Helm installation. Helm repositories are similar to package repositories in Linux distributions as in they contain different available packages of 
 Kubernetes manifests for users to consume.
 
-The Icinga2 Helm repository is hosted on GitHub Pages and can be added to your Helm installation by running the following command:
+The Icinga Helm repository is hosted on GitHub Pages and can be added to your Helm installation by running the following command:
 
 ```console
 helm repo add icinga https://icinga.github.io/helm-charts
@@ -34,4 +34,4 @@ For information on how to contribute to this repository, see the [contribution g
 
 ## License
 
-This project is licensed under the terms of the [Apache 2.0](LICENSE) open source license.
+This project is licensed under the terms of the [Apache 2.0](LICENSE) open source license.

charts/icinga-stack/README.md

@@ -1,8 +1,8 @@
-# Icinga2 Kubernetes Helm Charts
+# Icinga Kubernetes Helm Charts
 
 > **WARNING**: This chart is currently in alpha state and should not be used in production. Breaking changes in future releases are well possible.
 
-[Icinga2](https://icinga.com) is a monitoring system which checks the availability of your network resources, notifies users of outages, and generates performance data for reporting.
+[Icinga](https://icinga.com) is a monitoring system which checks the availability of your network resources, notifies users of outages, and generates performance data for reporting.
 
 [Helm](https://helm.sh) is a tool for managing Kubernetes charts. Charts are packages of pre-configured Kubernetes resources.
 
@@ -19,19 +19,19 @@ This chart bootstraps a complete Icinga environment on a [Kubernetes](http://kub
 
 ### Add Helm repository
 
-First you need to add the Icinga2 Helm repository to your Helm installation. Helm repositories are similar to package repositories in Linux distributions as in they contain different available packages of 
+First you need to add the Icinga Helm repository to your Helm installation. Helm repositories are similar to package repositories in Linux distributions as in they contain different available packages of 
 Kubernetes manifests for users to consume.
 
-The Icinga2 Helm repository is hosted on GitHub Pages and can be added to your Helm installation by running the following command:
+The Icinga Helm repository is hosted on GitHub Pages and can be added to your Helm installation by running the following command:
 
 ```console
 helm repo add icinga https://icinga.github.io/helm-charts
 helm repo update
 ```
 
-### Install Icinga2
+### Install Icinga
 
-Once the repository is known to your Helm installation, you can install Icinga2 by running the following command:
+Once the repository is known to your Helm installation, you can install Icinga by running the following command:
 
 ```console
 helm install <release-name> \

charts/icinga-stack/charts/icinga2/templates/_core_config.tpl

@@ -1,5 +1,5 @@
 {{- define "icinga2.config" -}}
-// Constants for Icinga2 from constants.conf
+// Constants for Icinga 2 from constants.conf
 const PluginDir = "/usr/lib/nagios/plugins"
 const ManubulonPluginDir = "/usr/lib/nagios/plugins"
 const PluginContribDir = "/usr/lib/nagios/plugins"

charts/icinga-stack/charts/icingaweb2/templates/_icingaweb-config.tpl

@@ -36,7 +36,7 @@
       name: {{ .Values.auth.admin_password.credSecret | quote }}
       key: {{ .Values.auth.admin_password.secretKey | quote }}
 {{- else }}
-{{ fail "IcingaWeb2 auth admin password not set. Set either .Values.icingaweb2.auth.admin_password.value or .Values.icingaweb2.auth.admin_password.credSecret and .Values.icingaweb2.auth.admin_password.secretKey" }}
+{{ fail "Icinga Web auth admin password not set. Set either .Values.icingaweb2.auth.admin_password.value or .Values.icingaweb2.auth.admin_password.credSecret and .Values.icingaweb2.auth.admin_password.secretKey" }}
 {{- end}}
 - name: icingaweb.config.global.config_resource
   value: {{ .Values.auth.resource | default .Values.global.databases.icingaweb2.database | quote }}