Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion horizon/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.1.17
version: 1.1.18

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
3 changes: 2 additions & 1 deletion horizon/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ kubectl create configmap -n $instance $configmap --from-file=lots-of-zeros.zip
| core.configuration.http.adminPassword | string | `"admin"` | |
| core.configuration.http.restPassword | string | `"admin"` | |
| core.configuration.http.restUsername | string | `"opennms"` | |
| core.configuration.instanceId | string | `"OpenNMS"` | Used only when multiTenant=false, otherwise it uses the release name |
| core.configuration.nodeSelector | string | `nil` | |
| core.configuration.ports.karaf.enabled | bool | `true` | |
| core.configuration.ports.karaf.externalPort | int | `8101` | |
Expand Down Expand Up @@ -246,7 +247,7 @@ kubectl create configmap -n $instance $configmap --from-file=lots-of-zeros.zip
| ingress.annotations | object | `{}` | |
| ingress.certManager.clusterIssuer | string | `"opennms-issuer"` | |
| ingress.className | string | `"nginx"` | |
| multiTenant | bool | `false` | Enable multi-tenant mode. This will use the release name as the per-tenant identifier for the OpenNMS instance ID, databases, Kakfa topics, ElasticSearch indices, and Prometheus organization ID. |
| multiTenant | bool | `false` | Enable multi-tenant mode. This will use the release name as the per-tenant identifier for the OpenNMS instance ID, databases, Kafka topics, ElasticSearch indices, and Prometheus organization ID. |
| promtail.image.pullPolicy | string | `"IfNotPresent"` | |
| promtail.image.repository | string | `"grafana/promtail"` | |
| promtail.image.tag | string | `"latest"` | |
Expand Down
2 changes: 1 addition & 1 deletion horizon/templates/app-settings.configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ data:
{{- if .Values.multiTenant }}
OPENNMS_INSTANCE_ID: {{ .Release.Name | quote }}
{{- else }}
OPENNMS_INSTANCE_ID: ""
OPENNMS_INSTANCE_ID: {{ .Values.core.configuration.instanceId | quote }}
{{- end }}
OPENNMS_SERVER: {{ include "namespace" . | printf "onms-core.%s.svc" | quote }}
{{- if .Values.multiTenant }}
Expand Down
5 changes: 5 additions & 0 deletions horizon/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,11 @@
"alwaysRollDeployment": {
"type": "boolean"
},
"instanceId": {
"type": "string",
"default": "OpenNMS",
"description": "Sets the OpenNMS instance ID. When multiTenant=true, this value is ignored and the release name is used instead."
},
"timeSeriesStrategy": {
"type": "string"
},
Expand Down
4 changes: 3 additions & 1 deletion horizon/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
timezone: America/New_York
domain: example.com # The common domain for the Ingress resource.

# -- Enable multi-tenant mode. This will use the release name as the per-tenant identifier for the OpenNMS instance ID, databases, Kakfa topics, ElasticSearch indices, and Prometheus organization ID.
# -- Enable multi-tenant mode. This will use the release name as the per-tenant identifier for the OpenNMS instance ID, databases, Kafka topics, ElasticSearch indices, and Prometheus organization ID.
multiTenant: false

# -- Install resource objects into namespace named for the Helm release. See also createNamespace.
Expand Down Expand Up @@ -132,6 +132,8 @@ core:
cpu: '2'
memory: 4Gi
configuration:
# -- Used only when multiTenant=false, otherwise it uses the release name
instanceId: OpenNMS
alwaysRollDeployment: true
timeSeriesStrategy: rrd
enableAlec: false # See alecImage below for how the KAR is retrieved
Expand Down