diff --git a/charts/bindplane/Chart.yaml b/charts/bindplane/Chart.yaml index edd7a5f..a0c06a0 100644 --- a/charts/bindplane/Chart.yaml +++ b/charts/bindplane/Chart.yaml @@ -3,7 +3,7 @@ name: bindplane description: BindPlane OP is an observability pipeline. type: application # The chart's version -version: 1.17.1 +version: 1.17.2 # The BindPlane OP tagged release. If the user does not # set the `image.tag` values option, this version is used. appVersion: 1.73.0 diff --git a/charts/bindplane/README.md b/charts/bindplane/README.md index f7ea6d5..c4441fd 100644 --- a/charts/bindplane/README.md +++ b/charts/bindplane/README.md @@ -1,6 +1,6 @@ # bindplane -![Version: 1.17.1](https://img.shields.io/badge/Version-1.17.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.73.0](https://img.shields.io/badge/AppVersion-1.73.0-informational?style=flat-square) +![Version: 1.17.2](https://img.shields.io/badge/Version-1.17.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.73.0](https://img.shields.io/badge/AppVersion-1.73.0-informational?style=flat-square) BindPlane OP is an observability pipeline. @@ -80,9 +80,6 @@ BindPlane OP is an observability pipeline. | dev.bindplane.auth.auth0.domain | string | `""` | | | dev.namespace.create | bool | `false` | | | dev.namespace.name | string | `""` | | -| dev.prometheus.create | bool | `false` | | -| dev.prometheus.image.name | string | `"prom/prometheus"` | | -| dev.prometheus.image.tag | string | `"v2.47.2"` | | | email.sendgrid.token | string | `""` | The sendgrid API token to use when authenticating to Sendgrid. | | email.type | string | `""` | The optional email backend type to use. Valid options include `sendgrid`. Requires an auth type other than `system`. | | eventbus.pubsub.credentials.secret | string | `""` | Optional Kubernetes secret which contains Google Cloud JSON service account credentials. Not required when running within Google Cloud with the Pub/Sub scope enabled. | diff --git a/charts/bindplane/templates/prometheus.deprecated.yaml b/charts/bindplane/templates/prometheus.deprecated.yaml deleted file mode 100644 index bcb348f..0000000 --- a/charts/bindplane/templates/prometheus.deprecated.yaml +++ /dev/null @@ -1,129 +0,0 @@ -{{- if .Values.dev.prometheus.create }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "bindplane.fullname" . }}-prometheus -data: - # Both of these should be empty, but might contain - # configuration in the future. - prometheus.yml: | - scrape_configs: [] - rule_files: [/etc/prometheus/rules.yml] - web.yml: | - # This is an empty config. - rules.yml: | - groups: - - name: configuration-rollups - interval: 1m - rules: - - record: bindplane_agent_measurements:rollup:rate:1m - expr: sum without (agent) (rate(bindplane_agent_measurements{}[1m9s999ms] offset 10s)) ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ include "bindplane.fullname" . }}-prometheus - labels: - app.kubernetes.io/name: test-prometheus -spec: - replicas: 1 - serviceName: bindplane-test-prometheus - selector: - matchLabels: - app.kubernetes.io/name: test-prometheus - template: - metadata: - labels: - app.kubernetes.io/name: test-prometheus - spec: - initContainers: - # Set permissions on /prometheus volume. - - name: setup-volumes - image: {{ .Values.dev.prometheus.image.name }}:{{ .Values.dev.prometheus.image.tag }} - securityContext: - runAsUser: 0 - command: - - "chown" - - "65534:" - - "/prometheus" - volumeMounts: - - mountPath: /prometheus - name: tsdb - containers: - - name: opentelemetry-container - image: {{ .Values.dev.prometheus.image.name }}:{{ .Values.dev.prometheus.image.tag }} - imagePullPolicy: IfNotPresent - command: - - /bin/prometheus - - --web.listen-address=:9090 - - --config.file=/etc/prometheus/prometheus.yml - - --web.config.file=/etc/prometheus/web.yml - - --web.console.libraries=/usr/share/prometheus/console_libraries - - --web.console.templates=/usr/share/prometheus/consoles - - --web.enable-remote-write-receiver - - --storage.tsdb.path=/prometheus - - --storage.tsdb.retention.time=2d - securityContext: - readOnlyRootFilesystem: true - ports: - - name: http - containerPort: 9090 - protocol: TCP - resources: - requests: - memory: 300Mi - cpu: 100m - limits: - memory: 300Mi - volumeMounts: - # prometheus and web configuration - # from configmap. - - mountPath: /etc/prometheus/prometheus.yml - subPath: prometheus.yml - name: config - - mountPath: /etc/prometheus/web.yml - subPath: web.yml - name: config - - mountPath: /etc/prometheus/rules.yml - subPath: rules.yml - name: config - # time series database persistent volume. - - mountPath: /prometheus - name: tsdb - volumes: - - name: config - configMap: - name: {{ include "bindplane.fullname" . }}-prometheus - # Delete persistent volumes when the statefulset is deleted. - persistentVolumeClaimRetentionPolicy: - whenDeleted: Retain - whenScaled: Retain - volumeClaimTemplates: - - metadata: - name: tsdb - labels: - app.kubernetes.io/name: test-prometheus - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 60Gi ---- -apiVersion: v1 -kind: Service -metadata: - name: {{ include "bindplane.fullname" . }}-prometheus - labels: - app.kubernetes.io/name: test-prometheus -spec: - ports: - - port: 9090 - protocol: TCP - targetPort: http - name: http - selector: - app.kubernetes.io/name: test-prometheus - sessionAffinity: None - type: ClusterIP -{{- end }} diff --git a/charts/bindplane/templates/prometheus.yaml b/charts/bindplane/templates/prometheus.yaml index d789c6e..f63e8b7 100644 --- a/charts/bindplane/templates/prometheus.yaml +++ b/charts/bindplane/templates/prometheus.yaml @@ -1,6 +1,5 @@ {{- if not .Values.prometheus.remote }} {{- if not .Values.prometheus.enableSideCar }} -{{- if not .Values.dev.prometheus.create }} apiVersion: apps/v1 kind: StatefulSet metadata: @@ -118,4 +117,3 @@ spec: type: ClusterIP {{- end }} {{- end }} -{{- end }} diff --git a/charts/bindplane/values.yaml b/charts/bindplane/values.yaml index b6b5061..c2ca985 100644 --- a/charts/bindplane/values.yaml +++ b/charts/bindplane/values.yaml @@ -521,18 +521,6 @@ dev: # to use this namespace. name: "" - # DEPRECATED: Use the `prometheus` top level section instead. - # Manages a prometheus deployment for development purposes. Production - # deployments should use a proper prometheus backend deployed outside - # of this chart. - prometheus: - # Whether or not prometheus should be deployed. - create: false - image: - name: prom/prometheus - # Generally this should match the version found - # here https://github.com/observIQ/bindplane-op-enterprise/blob/release/v1.38.0/PROMETHEUS_VERSION - tag: v2.47.2 bindplane: auth: auth0: