feat(prometheus): Use bindplane-prometheus container image #87
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jsirianni
commented
Feb 15, 2024
| @@ -368,7 +368,7 @@ spec: | |||
| {{- if eq (include "bindplane.deployment_type" .) "StatefulSet" }} | |||
| {{- if and (.Values.prometheus.enable) (.Values.prometheus.enableSideCar) }} | |||
| - name: prometheus | |||
| image: prom/prometheus:v2.47.2 | |||
| image: ghcr.io/observiq/bindplane-prometheus:{{ include "bindplane.tag" . }} | |||
There was a problem hiding this comment.
We use {{ include "bindplane.tag" . }} to determine the bindplane image tag as well. This will allow us to always deploy the correct Prometheus image for a given release.
jsirianni
commented
Feb 15, 2024
| - name: {{ include "bindplane.fullname" . }}-prometheus-data | ||
| mountPath: /var/lib/prometheus/tsdb | ||
| mountPath: /prometheus |
There was a problem hiding this comment.
/prometheus is the correct path for the bindplane-prometheus image. See the bottom of this PR https://github.com/observIQ/bindplane-op-enterprise/pull/2084/files
jsirianni
commented
Feb 15, 2024
| ports: | ||
| - containerPort: 9090 | ||
| name: http | ||
| args: |
There was a problem hiding this comment.
Args do not need to be set here anymore, they are baked into the bindplane-prometheus image. see the bottom of this pr https://github.com/observIQ/bindplane-op-enterprise/pull/2084/files
jsirianni
changed the title
jsirianni
force-pushed
the
use-bindplane-prometheus-image
branch
2 times, most recently
from
374c1d6 to
4a10373
Compare
jsirianni
force-pushed
the
epic/always-on-prometheus
branch
from
e8c0a7c to
a1f3583
Compare
…ume mount to use /prometheus, the correct path for the bindplane-prometheus image
jsirianni
force-pushed
the
use-bindplane-prometheus-image
branch
from
a1fad72 to
dfab9c4
Compare
3 tasks
jsirianni
requested review from
antonblock and
jmwilliams89
and removed request for
a team
jmwilliams89
approved these changes
Feb 16, 2024
jsirianni
added a commit
that referenced
this pull request
Feb 19, 2024
* use bindplane prometheus image and remove configmap * remove args, they are set in the container image already. updaste volume mount to use /prometheus, the correct path for the bindplane-prometheus image * pin sidecar test version
jsirianni
added a commit
that referenced
this pull request
Feb 26, 2024
* use bindplane prometheus image and remove configmap * remove args, they are set in the container image already. updaste volume mount to use /prometheus, the correct path for the bindplane-prometheus image * pin sidecar test version
jsirianni
added a commit
that referenced
this pull request
Feb 27, 2024
* bump minor version * run on all PRs * feat(prometheus): Use bindplane-prometheus container image (#87) * use bindplane prometheus image and remove configmap * remove args, they are set in the container image already. updaste volume mount to use /prometheus, the correct path for the bindplane-prometheus image * pin sidecar test version * feat(prometheus): Deploy Prometheus StatefulSet by default (#89) * remove sidecar * rename dev prometheus config * add prometheus statefulset * true up securityContext * add remote option * regen docs * remove prom enable from templates * use generated service name when host is not set * fix svc name * re-add sideCar option * revert size change * use localhost when sidecar * Regen docs * resolve test issues by using newer image * use ee image * Remove all test case as it requires a license * skip if dev prometheus is enabled * fix condition * add fsgroup for gke
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of Changes
This is merging into an epic branch. The epic branch already bumped the chart version. Epic branch will not merge until after 1.45 is released.
BindPlane 1.45 will be the first release that includes Prometheus container images pre configured for BindPlane. https://github.com/observIQ/bindplane-op-enterprise/pull/2084.
Changes
prom/prometheusimage withobserviq/bindplane-prometheusThe BindPlane Prometheus container image is pre configured with the correct configuration for the given BindPlane version, meaning we no longer need a configMap volume mount to inject the rollup rule configuration file.
Testing
New Install
We have a 1.43 BindPlane Prometheus image available, and it can be used fro testing by specifying the right image tag.
minikube start helm template --values ./values.yaml charts/bindplane | kubectl apply -f -Once deployed, you can check to see the image name and tag:
Check the UI
Sign in and configure an agent http://localhost:3011
Observe measurements in action
Upgrade
I tested upgrading from
mainbranch with the following processPlease check that the PR fulfills these requirements