diff --git a/CHANGELOG.md b/CHANGELOG.md index 644c1677..fff3a3d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,16 @@ ## unreleased * **Overall** * [CHANGE] Drop support for OpenShift 4.11; the minimum supported version of OpenShift is now 4.12. + * [FIX] Revised `samples/azure-deployment/README.md` to remove obsolete information and bring content up-to-date. (Fixes #612) + +* **Metrics** + * [FIX] Set environment variable `MON_TLS_PATH_INGRESS` to ensure correct datasource connection between Grafana +and Promethues in [Azure Deployment sample](samples/azure-deployment). (Fixes #614) + +* **Logging** + * [FIX] Corrected comments referencing OpenSearch connection information in `samples/generic-base/logging/user-values-es-exporter.yaml` +and `logging/user-values-es-exporter.yaml`. + * [FIX] Corrected typo in `logging/bin/deploy_fluentbit_azmonitor.sh` that prevented the script from executing properly. ## Version 1.2.22 (13FEB2024) * **Overall** diff --git a/logging/bin/deploy_fluentbit_azmonitor.sh b/logging/bin/deploy_fluentbit_azmonitor.sh index 43a3fa7e..225584d6 100755 --- a/logging/bin/deploy_fluentbit_azmonitor.sh +++ b/logging/bin/deploy_fluentbit_azmonitor.sh @@ -158,7 +158,7 @@ kubectl -n $LOG_NS label configmap fbaz-env-vars managed-by=v4m-es-script log_debug "Fluent Bit Helm Chart: repo [$FLUENTBIT_HELM_CHART_REPO] name [$FLUENTBIT_HELM_CHART_NAME] version [$FLUENTBIT_HELM_CHART_VERSION]" chart2install="$(get_helmchart_reference $FLUENTBIT_HELM_CHART_REPO $FLUENTBIT_HELM_CHART_NAME $FLUENTBIT_HELM_CHART_VERSION)" versionstring="$(get_helm_versionstring $FLUENTBIT_HELM_CHART_VERSION)" - log_debug "Installing Helm chart from artifact [$chart2install] + log_debug "Installing Helm chart from artifact [$chart2install]" # Deploy Fluent Bit via Helm chart helm $helmDebug upgrade --install v4m-fbaz --namespace $LOG_NS \ diff --git a/logging/user-values-es-exporter.yaml b/logging/user-values-es-exporter.yaml index 85117265..4bfd57e6 100644 --- a/logging/user-values-es-exporter.yaml +++ b/logging/user-values-es-exporter.yaml @@ -8,4 +8,4 @@ # es: ## The env vars ES_USER and ES_PASSWORD are set, by default, ## based on the K8s secret internal-user-metricgetter -# uri: https://$(ES_USER):$(ES_PASSWORD)@v4m-es-client-service:9200 +# uri: https://$(ES_USER):$(ES_PASSWORD)@v4m-search:9200 diff --git a/samples/azure-deployment/README.md b/samples/azure-deployment/README.md index a51e1d35..0f700e59 100644 --- a/samples/azure-deployment/README.md +++ b/samples/azure-deployment/README.md @@ -39,8 +39,20 @@ path-based ingress and are available at the following URLs. Be sure to replace the host names in the URLs with the host names for your deployment. * `https://host.mycluster.example.com/grafana` +* `https://host.mycluster.example.com/dashboards` + +This sample does not make Prometheus and Alertmanager available since these +web applications do not provide any sort of user-authentication. However, +if you want to make these applications available, you can do so by setting +the `enabled` key available in the appropriate section of the `monitoring/user-values=prom-operator.yaml` +file (e.g. set the key `alertmanager.ingress.enabled` to 'true' to make +Alertmanager accessible). + +If you have chosen to make these applications available, the applications +are available at the following URLs. As mentioned above, be sure to +replace the host names in the URLs with the host names for your deployment. + * `https://host.mycluster.example.com/prometheus` * `https://host.mycluster.example.com/alertmanager` -* `https://host.mycluster.example.com/kibana` For an example of using host-based ingress, see the [ingress sample](../ingress). diff --git a/samples/azure-deployment/monitoring/user.env b/samples/azure-deployment/monitoring/user.env new file mode 100644 index 00000000..a413c403 --- /dev/null +++ b/samples/azure-deployment/monitoring/user.env @@ -0,0 +1 @@ +MON_TLS_PATH_INGRESS=true \ No newline at end of file diff --git a/samples/generic-base/logging/user-values-es-exporter.yaml b/samples/generic-base/logging/user-values-es-exporter.yaml index 85117265..4bfd57e6 100644 --- a/samples/generic-base/logging/user-values-es-exporter.yaml +++ b/samples/generic-base/logging/user-values-es-exporter.yaml @@ -8,4 +8,4 @@ # es: ## The env vars ES_USER and ES_PASSWORD are set, by default, ## based on the K8s secret internal-user-metricgetter -# uri: https://$(ES_USER):$(ES_PASSWORD)@v4m-es-client-service:9200 +# uri: https://$(ES_USER):$(ES_PASSWORD)@v4m-search:9200