[GitHub] [couchdb-helm] willholley commented on a change in pull request #10: Add prometheus metrics sidecar

2020-05-20 Thread GitBox


willholley commented on a change in pull request #10:
URL: https://github.com/apache/couchdb-helm/pull/10#discussion_r427882596



##
File path: couchdb/templates/statefulset.yaml
##
@@ -125,6 +129,40 @@ spec:
 {{- if .Values.sidecars }}
 {{ toYaml .Values.sidecars | indent 8}}
 {{- end }}
+{{- if .Values.telemetry.enabled }}
+- name: telemetry
+  image: "{{ .Values.telemetryImage.repository }}:{{ 
.Values.telemetryImage.tag }}"
+  imagePullPolicy: {{ .Values.telemetryImage.pullPolicy }}
+  ports:
+- name: telemetry
+  containerPort: 9984
+  args: ["--couchdb.uri=http://127.0.0.1:5984";]
+  livenessProbe:
+httpGet:
+  path: /metrics
+  port: 9984
+  readinessProbe:
+httpGet:
+  path: /metrics
+  port: 9984
+  resources:
+{{ toYaml .Values.telemetry.resources | indent 12 }}
+  env:
+- name: DATABASES
+  value: {{ .Values.telemetry.databases }}
+{{- if not .Values.allowAdminParty }}
+- name: "COUCHDB.USERNAME"
+  valueFrom:
+secretKeyRef:
+  name: {{ template "couchdb.defaultsecret" . }}

Review comment:
   looking at it again, I think the original was correct. The admin 
username and password are stored 
[here](https://github.com/apache/couchdb-helm/blob/master/couchdb/templates/secrets.yaml#L5)
 so they should both refer to `{{ template "couchdb.fullname" . }}`





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [couchdb-helm] willholley commented on a change in pull request #10: Add prometheus metrics sidecar

2020-05-20 Thread GitBox


willholley commented on a change in pull request #10:
URL: https://github.com/apache/couchdb-helm/pull/10#discussion_r427864884



##
File path: couchdb/templates/statefulset.yaml
##
@@ -108,6 +112,40 @@ spec:
   - name: database-storage
 mountPath: /opt/couchdb-search/data
 {{- end }}
+{{- if .Values.telemetry.enabled }}
+- name: telemetry
+  image: "{{ .Values.telemetryImage.repository }}:{{ 
.Values.telemetryImage.tag }}"
+  imagePullPolicy: {{ .Values.telemetryImage.pullPolicy }}
+  ports:
+- name: telemetry
+  containerPort: 9984
+  args: ["--couchdb.uri=http://localhost:5984";]
+  livenessProbe:
+httpGet:
+  path: /metrics
+  port: 9984
+  readinessProbe:
+httpGet:
+  path: /metrics
+  port: 9984
+  resources:
+{{ toYaml .Values.telemetry.resources | indent 12 }}
+  env:
+- name: DATABASES
+  value: {{ .Values.telemetry.databases }}
+{{- if not .Values.allowAdminParty }}
+- name: "COUCHDB.USERNAME"
+  valueFrom:
+secretKeyRef:
+  name: {{ template "couchdb.fullname" . }}
+  key: adminUsername
+- name: "COUCHDB.PASSWORD"
+  valueFrom:
+secretKeyRef:
+  name: {{ template "couchdb.fullname" . }}

Review comment:
   good catch - fixed!





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org