Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

K8s-3522 Removed prometheus exporter from sync gateway #132

Merged
merged 4 commits into from
Jul 11, 2024
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 charts/couchbase-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: couchbase-operator
description: A Helm chart to deploy the Couchbase Autonomous Operator for easily deploying, managing, and maintaining Couchbase Clusters. Couchbase Server is a NoSQL document database with a distributed architecture for performance, scalability, and availability. It enables developers to build applications easier and faster by leveraging the power of SQL with the flexibility of JSON.
version: 2.64.0
Lumin343 marked this conversation as resolved.
Show resolved Hide resolved
version: 2.64.1
appVersion: 2.6.4
type: application
keywords:
Expand Down
3 changes: 0 additions & 3 deletions charts/couchbase-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -291,9 +291,6 @@ for more information about customizing and managing your charts.
| syncGateway.imagePullPolicy | string | `"IfNotPresent"` | |
| syncGateway.kind | string | `"Deployment"` | Kind of resource to use when installing sync gateway resource. suppports (Deployment | Statefulset) |
| syncGateway.labels | object | `{}` | Labels to apply to the deployment resource |
| syncGateway.monitoring.prometheus.enabled | bool | `false` | Defines whether Prometheus metric collection is enabled |
| syncGateway.monitoring.prometheus.image | object | `{"repository":"couchbasesamples/sync-gateway-prometheus-exporter","tag":"latest"}` | Image used by the Sync Gateway to perform metric collection (injected as a "sidecar" in each Sync Gateway Pod) |
| syncGateway.monitoring.prometheus.resources | object | `{}` | |
| syncGateway.name | string | `nil` | Name of the sync gateway pod. defaults to name of chart |
| syncGateway.nodeSelector | object | `{}` | Which nodes to run the pods on |
| syncGateway.podLabels | object | `{}` | Labels to apply to the pods |
Expand Down
3 changes: 0 additions & 3 deletions charts/couchbase-operator/README.md.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -270,9 +270,6 @@
| syncGateway.imagePullPolicy | string | `"IfNotPresent"` |
| syncGateway.kind | string | `"Deployment"` | Kind of resource to use when installing sync gateway resource. suppports (Deployment | Statefulset)
| syncGateway.labels | object | `{}` | Labels to apply to the deployment resource
| syncGateway.monitoring.prometheus.enabled | bool | `false` | Defines whether Prometheus metric collection is enabled
| syncGateway.monitoring.prometheus.image | object | `{"repository":"couchbasesamples/sync-gateway-prometheus-exporter","tag":"latest"}` | Image used by the Sync Gateway to perform metric collection (injected as a "sidecar" in each Sync Gateway Pod)
| syncGateway.monitoring.prometheus.resources | object | `{}` |
| syncGateway.name | string | `nil` | Name of the sync gateway pod. defaults to name of chart
| syncGateway.nodeSelector | object | `{}` | Which nodes to run the pods on
| syncGateway.podLabels | object | `{}` | Labels to apply to the pods
Expand Down
31 changes: 0 additions & 31 deletions charts/couchbase-operator/templates/sync-gateway-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,6 @@ spec:
{{- end }}
resources:
{{ toYaml .Values.syncGateway.resources | indent 10 }}
{{- if .Values.syncGateway.monitoring.prometheus.enabled }}
- name: exporter
image: {{ (printf "%s:%s" .Values.syncGateway.monitoring.prometheus.image.repository .Values.syncGateway.monitoring.prometheus.image.tag) | quote }}
args: ["--log.level={{ default "info" .Values.syncGateway.monitoring.prometheus.logLevel }}"]
ports:
- name: http
containerPort: 9421
resources:
{{ toYaml .Values.syncGateway.monitoring.prometheus.resources | indent 10 }}
{{- end }}
volumes:
- name: config
secret:
Expand Down Expand Up @@ -191,27 +181,6 @@ spec:
sessionAffinity: None
type: LoadBalancer
{{- end -}}
{{- if .Values.syncGateway.monitoring.prometheus.enabled }}
---
apiVersion: v1
kind: Service
metadata:
name: sync-gateway-exporter
labels:
app.kubernetes.io/name: {{ include "couchbase-cluster.sg.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
helm.sh/chart: {{ include "couchbase-cluster.chart" . }}
spec:
ports:
- port: 9421
protocol: TCP
targetPort: http
name: http
selector:
app.kubernetes.io/name: {{ include "couchbase-cluster.sg.name" . }}
type: ClusterIP
{{- end -}}
{{- if not .Values.syncGateway.configSecret }}
{{ $syncGatewayConfig := deepCopy .Values.syncGateway.config }}
---
Expand Down
16 changes: 0 additions & 16 deletions charts/couchbase-operator/values-all.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -518,22 +518,6 @@ syncGateway:
annotations: {}
# -- Optionally configure traffic policy for LoadBalancer and NodePort
externalTrafficPolicy:
# defines integration with third party monitoring software
monitoring:
prometheus:
# -- Defines whether Prometheus metric collection is enabled
enabled: false
# -- Image used by the Sync Gateway to perform metric collection
# (injected as a "sidecar" in each Sync Gateway Pod)
image:
repository: couchbasesamples/sync-gateway-prometheus-exporter
tag: latest
# pod
resources: {}
# requests:
# cpu: 100m
# limits:
# cpu: 100m
# -- Database config
config:
logging:
Expand Down
16 changes: 0 additions & 16 deletions charts/couchbase-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -518,22 +518,6 @@ syncGateway:
annotations: {}
# -- Optionally configure traffic policy for LoadBalancer and NodePort
externalTrafficPolicy:
# defines integration with third party monitoring software
monitoring:
prometheus:
# -- Defines whether Prometheus metric collection is enabled
enabled: false
# -- Image used by the Sync Gateway to perform metric collection
# (injected as a "sidecar" in each Sync Gateway Pod)
image:
repository: couchbasesamples/sync-gateway-prometheus-exporter
tag: latest
# pod
resources: {}
# requests:
# cpu: 100m
# limits:
# cpu: 100m
# -- Database config
config:
logging:
Expand Down
16 changes: 0 additions & 16 deletions charts/couchbase-operator/values.yamltmpl
Original file line number Diff line number Diff line change
Expand Up @@ -518,22 +518,6 @@ syncGateway:
annotations: {}
# -- Optionally configure traffic policy for LoadBalancer and NodePort
externalTrafficPolicy:
# defines integration with third party monitoring software
monitoring:
prometheus:
# -- Defines whether Prometheus metric collection is enabled
enabled: false
# -- Image used by the Sync Gateway to perform metric collection
# (injected as a "sidecar" in each Sync Gateway Pod)
image:
repository: couchbasesamples/sync-gateway-prometheus-exporter
tag: latest
# pod
resources: {}
# requests:
# cpu: 100m
# limits:
# cpu: 100m
# -- Database config
config:
logging:
Expand Down
Loading