diff --git a/deploy/charts/emqx/templates/secret.yaml b/deploy/charts/emqx/templates/secret.yaml index b9a452006..f2ff16f6a 100644 --- a/deploy/charts/emqx/templates/secret.yaml +++ b/deploy/charts/emqx/templates/secret.yaml @@ -6,8 +6,16 @@ metadata: namespace: {{ .Release.Namespace }} type: kubernetes.io/basic-auth stringData: + {{- if not (empty .Values.emqxConfig.EMQX_DASHBOARD__DEFAULT_USERNAME) }} username: admin + {{- else }} + username: {{ .Values.emqxConfig.EMQX_DASHBOARD__DEFAULT_USERNAME }} + {{- end }} + {{- if not (empty .Values.emqxConfig.EMQX_DASHBOARD__DEFAULT_PASSWORD) }} password: public + {{- else }} + password: {{ .Values.emqxConfig.EMQX_DASHBOARD__DEFAULT_PASSWORD}} + {{- end }} {{- end }} # this credentials are not configurable \ No newline at end of file diff --git a/deploy/charts/emqx/templates/service-monitor.yaml b/deploy/charts/emqx/templates/service-monitor.yaml index 2f6eb9db7..3d97ab351 100644 --- a/deploy/charts/emqx/templates/service-monitor.yaml +++ b/deploy/charts/emqx/templates/service-monitor.yaml @@ -16,9 +16,9 @@ metadata: spec: endpoints: - interval: 10s - port: mgmt + port: dashboard scheme: http - path: /api/v4/emqx_prometheus + path: /api/v5/prometheus/stats params: type: - prometheus diff --git a/deploy/charts/emqx/values.yaml b/deploy/charts/emqx/values.yaml index c6d8ae0c0..2bccefeee 100644 --- a/deploy/charts/emqx/values.yaml +++ b/deploy/charts/emqx/values.yaml @@ -99,6 +99,8 @@ emqxConfig: EMQX_CLUSTER__K8S__SUFFIX: "svc.cluster.local" ## if EMQX_CLUSTER__K8S__ADDRESS_TYPE eq dns # EMQX_CLUSTER__K8S__SUFFIX: "pod.cluster.local" + EMQX_DASHBOARD__DEFAULT_USERNAME: "admin" + EMQX_DASHBOARD__DEFAULT_PASSWORD: "public" ## EMQX Enterprise Edition requires manual creation of a Secret containing the licensed content. Write the name of Secret to the value of "emqxLicenseSecretName" ## Example: