Fix labels for Service Monitors #2878

iblancasa · 2024-04-18T14:44:14Z

Description:: fix the labels for the Service Monitor integration. Exclude the headless Service from the integration with SM.

Resolves #2965
Resolves #2877

iblancasa · 2024-04-18T14:44:45Z

@IshwarKanse can you check if the behaviour is correct now? The test passed in my cluster but I need another couple of eyes.

yuriolisa · 2024-04-18T14:55:27Z

@IshwarKanse can you check if the behaviour is correct now? The test passed in my cluster but I need another couple of eyes.

AFAIK, we fixed that here.

jaronoff97

IMO rather than creating one service monitor for the self scrape and the prom exporter (which I think are on different ports) we should just make two service monitors. I worry that this is going to break users because it will cause dual scraping

internal/manifests/collector/service.go

internal/manifests/collector/servicemonitor.go

iblancasa · 2024-04-18T14:59:46Z

@IshwarKanse can you check if the behaviour is correct now? The test passed in my cluster but I need another couple of eyes.

AFAIK, we fixed that here.

The SM has the label for the monitor Service but not for the collector. So, it doesn't match the collector and the Prometheus exporter is never scrapped.

…sent Signed-off-by: Israel Blancas <[email protected]>

pavolloffay · 2024-04-24T07:52:47Z

it seems like e2e tests are failing

IshwarKanse · 2024-04-24T08:00:49Z

The PR needs to be updated.

.chloggen/bug_2877.yaml

…or into bug/2877

Signed-off-by: Israel Blancas <[email protected]>

IshwarKanse · 2024-04-26T06:26:28Z

@iblancasa We need to update this test as well e2e-openshift/otlp-metrics-traces

jaronoff97

approach broadly makes sense, a few thoughts/questions.

internal/manifests/collector/servicemonitor.go

internal/manifests/collector/service.go

…or into bug/2877

Signed-off-by: Israel Blancas <[email protected]>

.chloggen/bug_2877.yaml

pavolloffay · 2024-04-29T13:22:31Z

internal/manifests/collector/podmonitor.go

+		"params.OtelCol.namespace", params.OtelCol.Namespace,
+	)
+
+	if !params.OtelCol.Spec.Observability.Metrics.EnableMetrics {


personal opinion but this statement can be written in a more readable way

if params.OtelCol.Spec.Observability.Metrics.EnableMetrics && params.Config.PrometheusCRAvailability() == prometheus.NotAvailable && params.OtelCol.Spec.Mode == v1beta1.ModeSidecar{ return true } l..V(2).Info("PodMonitor will not be created", "Metrics.enabledMetrics", "params.OtelCol.Spec.Observability.Metrics.EnableMetrics ", ....) return false

and I would move the logger creation close to returning false

Why a double condition + no log message is easier to read than the current approach?

The current is easy to follow and understand why the method returns false.

A single log message with all parameters makes it clear to understand the overall state.

The function has 2 states (true and false), aligning the condition to it makes it easier to understand

pavolloffay · 2024-04-29T13:23:25Z

internal/manifests/collector/servicemonitor.go

@@ -78,6 +85,25 @@ func ServiceMonitor(params manifests.Params) (*monitoringv1.ServiceMonitor, erro
 	return &sm, nil
 }

+func shouldCreateServiceMonitor(params manifests.Params) bool {


personal opinion but this statement can be written in a more readable way

See the previous comment

…or into bug/2877

Signed-off-by: Israel Blancas <[email protected]>

…or into bug/2877

Signed-off-by: Israel Blancas <[email protected]>

…r into bug/2877

swiatekm

LGTM, minor nitpick about the changelog.

.chloggen/bug_2877.yaml

…r into bug/2877

…or into bug/2877

Signed-off-by: Israel Blancas <[email protected]>

pavolloffay · 2024-05-14T09:10:47Z

@jaronoff97 could you please re-review?

…or into bug/2877

jaronoff97

Just one thought to prevent this from breaking users

jaronoff97 · 2024-05-17T15:08:46Z

internal/manifests/collector/service.go

 const (
-	headlessLabel   = "operator.opentelemetry.io/collector-headless-service"
-	monitoringLabel = "operator.opentelemetry.io/collector-monitoring-service"


@iblancasa i think we should keep these around for now, mark them as deprecated and remove them in two+ versions rather than deleting them outright which would constitute a breaking change.

Signed-off-by: Israel Blancas <[email protected]>

…or into bug/2877

tests/e2e-prometheuscr/create-sm-prometheus-exporters/05-assert.yaml

Signed-off-by: Israel Blancas <[email protected]>

iblancasa · 2024-05-17T16:53:47Z

I think it should be fine now. I'm having some problems running this locally due to some network restrictions...

jaronoff97 · 2024-05-17T18:04:41Z

@iblancasa looks like you missed one test https://github.com/open-telemetry/opentelemetry-operator/actions/runs/9131574679/job/25111089581?pr=2878

Signed-off-by: Israel Blancas <[email protected]>

iblancasa · 2024-05-19T02:50:18Z

@jaronoff97 thanks! I fixed the issue now. I added the label in an extra service.

* Create a separate Service Monitor when the Prometheus exporter is present Signed-off-by: Israel Blancas <[email protected]> * Improve changelog Signed-off-by: Israel Blancas <[email protected]> * Fix prometheus-cr E2E test Signed-off-by: Israel Blancas <[email protected]> * Remove unused target Signed-off-by: Israel Blancas <[email protected]> * Add docstring Signed-off-by: Israel Blancas <[email protected]> * Fix typo Signed-off-by: Israel Blancas <[email protected]> * Change the label name Signed-off-by: Israel Blancas <[email protected]> * Change changelog description Signed-off-by: Israel Blancas <[email protected]> * Recover removed labels Signed-off-by: Israel Blancas <[email protected]> * Add missing labels Signed-off-by: Israel Blancas <[email protected]> * Remove wrong labels Signed-off-by: Israel Blancas <[email protected]> --------- Signed-off-by: Israel Blancas <[email protected]>

* Initial commit * Added Cert Manager CRDs & RBAC validation and management * Added relevant resources and started adding tests * Bump github.com/gin-gonic/gin from 1.9.1 to 1.10.0 (#2953) Bumps [github.com/gin-gonic/gin](https://github.com/gin-gonic/gin) from 1.9.1 to 1.10.0. - [Release notes](https://github.com/gin-gonic/gin/releases) - [Changelog](https://github.com/gin-gonic/gin/blob/master/CHANGELOG.md) - [Commits](gin-gonic/gin@v1.9.1...v1.10.0) --- updated-dependencies: - dependency-name: github.com/gin-gonic/gin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump github.com/prometheus/prometheus in the prometheus group (#2951) Bumps the prometheus group with 1 update: [github.com/prometheus/prometheus](https://github.com/prometheus/prometheus). Updates `github.com/prometheus/prometheus` from 0.51.2 to 0.52.0 - [Release notes](https://github.com/prometheus/prometheus/releases) - [Changelog](https://github.com/prometheus/prometheus/blob/main/CHANGELOG.md) - [Commits](prometheus/prometheus@v0.51.2...v0.52.0) --- updated-dependencies: - dependency-name: github.com/prometheus/prometheus dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prometheus ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Support for collector readinessProbe (#2944) * enable readiness Probe for otel operator Signed-off-by: Janario Oliveira <[email protected]> * generate CRD and controller changes Signed-off-by: Janario Oliveira <[email protected]> * Adjusted code to be similar to Liveness logic Signed-off-by: Janario Oliveira <[email protected]> * Generated manifests Signed-off-by: Janario Oliveira <[email protected]> * Add changelog Signed-off-by: Janario Oliveira <[email protected]> * Fix lint Signed-off-by: Janario Oliveira <[email protected]> * Removed readinessProbe from alpha CRD Signed-off-by: Janario Oliveira <[email protected]> * Generated manifests Signed-off-by: Janario Oliveira <[email protected]> * Fix lint Signed-off-by: Janario Oliveira <[email protected]> * Centralized probe validation Signed-off-by: Janario Oliveira <[email protected]> --------- Signed-off-by: Janario Oliveira <[email protected]> Co-authored-by: hesam.hamdarsi <[email protected]> * Bump github.com/docker/docker (#2954) Bumps [github.com/docker/docker](https://github.com/docker/docker) from 26.0.1+incompatible to 26.0.2+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](moby/moby@v26.0.1...v26.0.2) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Added new Log Enconder Config (#2927) * Added new Log Enconder Config Signed-off-by: Yuri Sa <[email protected]> * Added new Log Enconder Config Signed-off-by: Yuri Sa <[email protected]> * Added new Log Enconder Config Signed-off-by: Yuri Sa <[email protected]> * Added new Log Enconder Config Signed-off-by: Yuri Sa <[email protected]> * Added new Log Enconder Config Signed-off-by: Yuri Sa <[email protected]> * Added new Log Enconder Config Signed-off-by: Yuri Sa <[email protected]> * Added new Debug doc Signed-off-by: Yuri Sa <[email protected]> --------- Signed-off-by: Yuri Sa <[email protected]> * [chore] move VineethReddy02 to emeritus (#2957) Signed-off-by: Juraci Paixão Kröhling <[email protected]> * Cleanup cluster roles and bindings (#2938) * Fix Signed-off-by: Pavol Loffay <[email protected]> * Fix Signed-off-by: Pavol Loffay <[email protected]> * Fix Signed-off-by: Pavol Loffay <[email protected]> * Fix Signed-off-by: Pavol Loffay <[email protected]> * Add test Signed-off-by: Pavol Loffay <[email protected]> --------- Signed-off-by: Pavol Loffay <[email protected]> * Fixed non-expected warnings on TA webhook. (#2962) Signed-off-by: Yuri Sa <[email protected]> * Verify ServiceMonitor and PodMonitor are installed in prom cr availability check (#2964) * Verify ServiceMonitor and PodMonitor are installed in prom cr availability check * Added changelog * Bump kyverno/action-install-chainsaw from 0.2.0 to 0.2.1 (#2968) Bumps [kyverno/action-install-chainsaw](https://github.com/kyverno/action-install-chainsaw) from 0.2.0 to 0.2.1. - [Release notes](https://github.com/kyverno/action-install-chainsaw/releases) - [Commits](kyverno/action-install-chainsaw@v0.2.0...v0.2.1) --- updated-dependencies: - dependency-name: kyverno/action-install-chainsaw dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix labels for Service Monitors (#2878) * Create a separate Service Monitor when the Prometheus exporter is present Signed-off-by: Israel Blancas <[email protected]> * Improve changelog Signed-off-by: Israel Blancas <[email protected]> * Fix prometheus-cr E2E test Signed-off-by: Israel Blancas <[email protected]> * Remove unused target Signed-off-by: Israel Blancas <[email protected]> * Add docstring Signed-off-by: Israel Blancas <[email protected]> * Fix typo Signed-off-by: Israel Blancas <[email protected]> * Change the label name Signed-off-by: Israel Blancas <[email protected]> * Change changelog description Signed-off-by: Israel Blancas <[email protected]> * Recover removed labels Signed-off-by: Israel Blancas <[email protected]> * Add missing labels Signed-off-by: Israel Blancas <[email protected]> * Remove wrong labels Signed-off-by: Israel Blancas <[email protected]> --------- Signed-off-by: Israel Blancas <[email protected]> * Prepare release 0.100.0 (#2960) * Prepare release 0.100.0 Signed-off-by: Vineeth Pothulapati <[email protected]> * update the chlog * update the chlog with #2877 merge --------- Signed-off-by: Vineeth Pothulapati <[email protected]> * [chore] Refactor allocation strategies (#2928) * Refactor consistent-hashing strategy * Refactor per-node strategy * Refactor least-weighted strategy * Minor allocation strategy refactor * Add some common allocation strategy tests * Fix collector and target reassignment * Minor allocator fixes * Add changelog entry * Fix an incorrect comment * Bring back webhook port (#2973) * add back webhook port * chlog * patch 0.100.1 (#2974) * Update the OpenTelemetry Java agent version to 2.4.0 (#2967) * simplify deletion logic (#2971) * Update maintainers in the operator hub PR (#2977) Signed-off-by: Pavol Loffay <[email protected]> * Support for kubernetes 1.30 version (#2975) * Support for kubernetes 1.30 version * Update makefile * [chore] Move TargetAllocator CRD to v1alpha1 (#2918) * [featuregate] Automatically set GOMEMLIMIT and GOMAXPROCS for collector, target allocator, opamp bridge (#2933) * set things * fix kustomize shim * restore, better chlog * Fix querying OpenShift user workload monitoring stack. (#2984) * Bump alpine from 3.19 to 3.20 (#2990) Bumps alpine from 3.19 to 3.20. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump alpine from 3.19 to 3.20 in /cmd/operator-opamp-bridge (#2991) Bumps alpine from 3.19 to 3.20. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump github.com/go-logr/logr from 1.4.1 to 1.4.2 (#2987) Bumps [github.com/go-logr/logr](https://github.com/go-logr/logr) from 1.4.1 to 1.4.2. - [Release notes](https://github.com/go-logr/logr/releases) - [Changelog](https://github.com/go-logr/logr/blob/master/CHANGELOG.md) - [Commits](go-logr/logr@v1.4.1...v1.4.2) --- updated-dependencies: - dependency-name: github.com/go-logr/logr dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump kyverno/action-install-chainsaw from 0.2.1 to 0.2.2 (#2989) Bumps [kyverno/action-install-chainsaw](https://github.com/kyverno/action-install-chainsaw) from 0.2.1 to 0.2.2. - [Release notes](https://github.com/kyverno/action-install-chainsaw/releases) - [Commits](kyverno/action-install-chainsaw@v0.2.1...v0.2.2) --- updated-dependencies: - dependency-name: kyverno/action-install-chainsaw dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump the otel group with 5 updates (#2986) Bumps the otel group with 5 updates: | Package | From | To | | --- | --- | --- | | [go.opentelemetry.io/otel](https://github.com/open-telemetry/opentelemetry-go) | `1.26.0` | `1.27.0` | | [go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp](https://github.com/open-telemetry/opentelemetry-go) | `1.26.0` | `1.27.0` | | [go.opentelemetry.io/otel/metric](https://github.com/open-telemetry/opentelemetry-go) | `1.26.0` | `1.27.0` | | [go.opentelemetry.io/otel/sdk](https://github.com/open-telemetry/opentelemetry-go) | `1.26.0` | `1.27.0` | | [go.opentelemetry.io/otel/sdk/metric](https://github.com/open-telemetry/opentelemetry-go) | `1.26.0` | `1.27.0` | Updates `go.opentelemetry.io/otel` from 1.26.0 to 1.27.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go@v1.26.0...v1.27.0) Updates `go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp` from 1.26.0 to 1.27.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go@v1.26.0...v1.27.0) Updates `go.opentelemetry.io/otel/metric` from 1.26.0 to 1.27.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go@v1.26.0...v1.27.0) Updates `go.opentelemetry.io/otel/sdk` from 1.26.0 to 1.27.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go@v1.26.0...v1.27.0) Updates `go.opentelemetry.io/otel/sdk/metric` from 1.26.0 to 1.27.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go@v1.26.0...v1.27.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel - dependency-name: go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel - dependency-name: go.opentelemetry.io/otel/metric dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel - dependency-name: go.opentelemetry.io/otel/sdk dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel - dependency-name: go.opentelemetry.io/otel/sdk/metric dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump alpine from 3.19 to 3.20 in /cmd/otel-allocator (#2992) Bumps alpine from 3.19 to 3.20. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Keep multiple versions of Collector Config (#2946) * Prepare v0.101.0 release (#2994) * Prepare v0.101.0 release * Undo kustomize stuff * Undo kustomize stuff again * Undo kustomize stuff again * Apply feedback * Add crd metrics usage information (#2825) * Add crd metrics usage information Signed-off-by: Ruben Vargas <[email protected]> * Add mode metric Signed-off-by: Ruben Vargas <[email protected]> * Refactor CR metrics Signed-off-by: Ruben Vargas <[email protected]> * Add annotation to avoid generate Metrics Signed-off-by: Ruben Vargas <[email protected]> * Add unit tests Signed-off-by: Ruben Vargas <[email protected]> * remove space Signed-off-by: Ruben Vargas <[email protected]> * remove global provider Signed-off-by: Ruben Vargas <[email protected]> * Update main.go Co-authored-by: Israel Blancas <[email protected]> * revert kusttomization.yaml Signed-off-by: Ruben Vargas <[email protected]> * rename some constants Signed-off-by: Ruben Vargas <[email protected]> * Add connectors metrics Signed-off-by: Ruben Vargas <[email protected]> * Update chlog Signed-off-by: Ruben Vargas <[email protected]> * merge new with init, rename some functions, improve changelog entry Signed-off-by: Ruben Vargas <[email protected]> * improve todo comment Signed-off-by: Ruben Vargas <[email protected]> * fix tests Signed-off-by: Ruben Vargas <[email protected]> * set flag to default false Signed-off-by: Ruben Vargas <[email protected]> * fix lint issues Signed-off-by: Ruben Vargas <[email protected]> * breaking line Signed-off-by: Ruben Vargas <[email protected]> * Use api reader to avoid cache issues Signed-off-by: Ruben Vargas <[email protected]> * Add info metric to changelog entry Signed-off-by: Ruben Vargas <[email protected]> --------- Signed-off-by: Ruben Vargas <[email protected]> Co-authored-by: Israel Blancas <[email protected]> * Update selector documentation for Target Allocator (#3001) * Bump github.com/prometheus/prometheus in the prometheus group (#3004) Bumps the prometheus group with 1 update: [github.com/prometheus/prometheus](https://github.com/prometheus/prometheus). Updates `github.com/prometheus/prometheus` from 0.52.0 to 0.52.1 - [Release notes](https://github.com/prometheus/prometheus/releases) - [Changelog](https://github.com/prometheus/prometheus/blob/main/CHANGELOG.md) - [Commits](prometheus/prometheus@v0.52.0...v0.52.1) --- updated-dependencies: - dependency-name: github.com/prometheus/prometheus dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prometheus ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump kyverno/action-install-chainsaw from 0.2.2 to 0.2.3 (#3003) Bumps [kyverno/action-install-chainsaw](https://github.com/kyverno/action-install-chainsaw) from 0.2.2 to 0.2.3. - [Release notes](https://github.com/kyverno/action-install-chainsaw/releases) - [Commits](kyverno/action-install-chainsaw@v0.2.2...v0.2.3) --- updated-dependencies: - dependency-name: kyverno/action-install-chainsaw dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Introduce simplified parsers (#2972) * Bump go.opentelemetry.io/otel/exporters/prometheus in the otel group (#3005) Bumps the otel group with 1 update: [go.opentelemetry.io/otel/exporters/prometheus](https://github.com/open-telemetry/opentelemetry-go). Updates `go.opentelemetry.io/otel/exporters/prometheus` from 0.48.0 to 0.49.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go@example/prometheus/v0.48.0...example/prometheus/v0.49.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel/exporters/prometheus dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump go.uber.org/zap from 1.26.0 to 1.27.0 (#3006) Bumps [go.uber.org/zap](https://github.com/uber-go/zap) from 1.26.0 to 1.27.0. - [Release notes](https://github.com/uber-go/zap/releases) - [Changelog](https://github.com/uber-go/zap/blob/master/CHANGELOG.md) - [Commits](uber-go/zap@v1.26.0...v1.27.0) --- updated-dependencies: - dependency-name: go.uber.org/zap dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update Kafka version in e2e test (#3009) * [chore] Bump opentelemetry-autoinstrumentation-python to 0.45b0 (#3000) * chore: Bump opentelemetry-autoinstrumentation-python to 0.45b0 * [chore] add psycopg==0.45b0 * Fix annotation/label filter setting (#3008) * fix how options are loaded by removing special casing * oop * chlog * update to specific test * oop * Added Cert Manager CRDs & RBAC validation and management * Added relevant resources and started adding tests * minor change * Minor change * minor change * Cleanup * Cleanup, go tidy and resolved conflics * Restored local dev changes * Refactored, removed init container, minor changes * Use correct files in TLS config * Added default value to getHttpsListenAddr * Added flag to enable mTLS between the Target Allocator and the Collector. go mod cleanup * Using the enable mTLS flag * Using feature gate in place of command line flags to enable the feature * Removed flag from manager yaml * Added featuregate func description * Initial unit/e2e tests. some cleanup * Using TA params * Cleanup makefile from local changes * Added step to create cert manager RBAC for e2e mtls tests * Using Kustomize for patching certmanager permissions * Cleanup chainsaw test * Cleanup chainsaw tests * e2e test case verifying Collector got secret from TA over mTLS * Added changelog, fixed unit tests * restored makefile * Renamed fg import * Linting rules for imports * Added more tests, updated the readme * Added steps in e2e tests for new app * Ran go mod tidy * Added new variable to test TA's AddTAConfigToPromConfig * Setting otel-col-contrib 0.108.0 in e2e test until operator gets updated * Update pkg/featuregate/featuregate.go Co-authored-by: Jacob Aronoff <[email protected]> * Added https, serviceMonitor and tls resources assertions to e2e tests * Using namespaced names for ClusterRoles * Cleanup * Added CertManager resources unit tests * Added unit tests and e2e assertions * Added missing assertion call * Update 00-install.yaml Removed collector image override for e2e test * Update pkg/featuregate/featuregate.go Co-authored-by: Mikołaj Świątek <[email protected]> * Minor fixes * Fixed tests referencing logging exporter * Moved mTLS file naming consts * Added missing curly bracket * Update TA-update-configs-to-enable-mtls.yaml * Update pkg/featuregate/featuregate.go Co-authored-by: Mikołaj Świątek <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Janario Oliveira <[email protected]> Signed-off-by: Yuri Sa <[email protected]> Signed-off-by: Juraci Paixão Kröhling <[email protected]> Signed-off-by: Pavol Loffay <[email protected]> Signed-off-by: Israel Blancas <[email protected]> Signed-off-by: Vineeth Pothulapati <[email protected]> Signed-off-by: Ruben Vargas <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Janario Oliveira <[email protected]> Co-authored-by: hesam.hamdarsi <[email protected]> Co-authored-by: Yuri Sa <[email protected]> Co-authored-by: Juraci Paixão Kröhling <[email protected]> Co-authored-by: Pavol Loffay <[email protected]> Co-authored-by: Aksel Skaar Leirvaag <[email protected]> Co-authored-by: Israel Blancas <[email protected]> Co-authored-by: Vineeth Pothulapati <[email protected]> Co-authored-by: Mikołaj Świątek <[email protected]> Co-authored-by: Jacob Aronoff <[email protected]> Co-authored-by: OpenTelemetry Bot <[email protected]> Co-authored-by: Vasi Vasireddy <[email protected]> Co-authored-by: Ishwar Kanse <[email protected]> Co-authored-by: Matt Hagenbuch <[email protected]> Co-authored-by: Tyler Helmuth <[email protected]> Co-authored-by: Ruben Vargas <[email protected]> Co-authored-by: brandonkzw <[email protected]> Co-authored-by: Mikołaj Świątek <[email protected]>

iblancasa requested a review from a team April 18, 2024 14:44

jaronoff97 requested changes Apr 18, 2024

View reviewed changes

internal/manifests/collector/service.go Show resolved Hide resolved

internal/manifests/collector/servicemonitor.go Outdated Show resolved Hide resolved

Create a separate Service Monitor when the Prometheus exporter is pre…

1625097

…sent Signed-off-by: Israel Blancas <[email protected]>

iblancasa force-pushed the bug/2877 branch from 67d3763 to 1625097 Compare April 22, 2024 13:23

pavolloffay reviewed Apr 24, 2024

View reviewed changes

.chloggen/bug_2877.yaml Outdated Show resolved Hide resolved

iblancasa added 4 commits April 25, 2024 18:18

Merge branch 'main' of github.com:open-telemetry/opentelemetry-operat…

78f1315

…or into bug/2877

Improve changelog

9ccd87f

Signed-off-by: Israel Blancas <[email protected]>

Fix prometheus-cr E2E test

5f55a01

Signed-off-by: Israel Blancas <[email protected]>

Remove unused target

e3174b6

Signed-off-by: Israel Blancas <[email protected]>

Merge branch 'main' into bug/2877

edfb463

jaronoff97 reviewed Apr 26, 2024

View reviewed changes

internal/manifests/collector/servicemonitor.go Outdated Show resolved Hide resolved

internal/manifests/collector/service.go Outdated Show resolved Hide resolved

iblancasa added 2 commits April 29, 2024 12:37

Merge branch 'main' of github.com:open-telemetry/opentelemetry-operat…

82fefa2

…or into bug/2877

Add docstring

28baa37

Signed-off-by: Israel Blancas <[email protected]>

pavolloffay reviewed Apr 29, 2024

View reviewed changes

iblancasa added 7 commits May 3, 2024 17:26

Merge branch 'main' of github.com:open-telemetry/opentelemetry-operat…

7dcaadb

…or into bug/2877

Fix typo

2e143ee

Signed-off-by: Israel Blancas <[email protected]>

Merge branch 'main' of github.com:open-telemetry/opentelemetry-operat…

cc96402

…or into bug/2877

Merge branch 'main' into bug/2877

978dfa0

Change the label name

f5b29d8

Signed-off-by: Israel Blancas <[email protected]>

Merge branch 'bug/2877' of github.com:iblancasa/opentelemetry-operato…

fff9870

…r into bug/2877

Merge branch 'main' into bug/2877

6432371

swiatekm approved these changes May 13, 2024

View reviewed changes

.chloggen/bug_2877.yaml Outdated Show resolved Hide resolved

iblancasa added 2 commits May 13, 2024 15:51

Merge branch 'bug/2877' of github.com:iblancasa/opentelemetry-operato…

2469162

…r into bug/2877

Merge branch 'main' of github.com:open-telemetry/opentelemetry-operat…

0b2a439

…or into bug/2877

Change changelog description

3712c43

Signed-off-by: Israel Blancas <[email protected]>

iblancasa requested a review from jaronoff97 May 13, 2024 13:57

Merge branch 'main' into bug/2877

743247b

pavolloffay approved these changes May 14, 2024

View reviewed changes

This was referenced May 17, 2024

Collector service monitor does not scape prometheus exporter #2965

Closed

Prepare release 0.100.0 #2960

Merged

Merge branch 'main' of github.com:open-telemetry/opentelemetry-operat…

552cb3e

…or into bug/2877

jaronoff97 reviewed May 17, 2024

View reviewed changes

iblancasa added 2 commits May 17, 2024 18:04

Recover removed labels

720c6b1

Signed-off-by: Israel Blancas <[email protected]>

Merge branch 'main' of github.com:open-telemetry/opentelemetry-operat…

d1889d0

…or into bug/2877

iblancasa requested a review from jaronoff97 May 17, 2024 16:05

jaronoff97 reviewed May 17, 2024

View reviewed changes

tests/e2e-prometheuscr/create-sm-prometheus-exporters/05-assert.yaml Show resolved Hide resolved

Add missing labels

cc84a10

Signed-off-by: Israel Blancas <[email protected]>

jaronoff97 approved these changes May 17, 2024

View reviewed changes

jaronoff97 enabled auto-merge (squash) May 17, 2024 16:51

Remove wrong labels

e5b251c

Signed-off-by: Israel Blancas <[email protected]>

auto-merge was automatically disabled May 19, 2024 02:35
Head branch was pushed to by a user without write access

pavolloffay approved these changes May 20, 2024

View reviewed changes

pavolloffay merged commit 13bc62d into open-telemetry:main May 20, 2024
33 checks passed

alexkruc mentioned this pull request Dec 5, 2024

Merge from Upstream (#1) #3514

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix labels for Service Monitors #2878

Fix labels for Service Monitors #2878

iblancasa commented Apr 18, 2024 •

edited by pavolloffay

Loading

iblancasa commented Apr 18, 2024

yuriolisa commented Apr 18, 2024

jaronoff97 left a comment

iblancasa commented Apr 18, 2024

pavolloffay commented Apr 24, 2024

IshwarKanse commented Apr 24, 2024

IshwarKanse commented Apr 26, 2024

jaronoff97 left a comment

pavolloffay Apr 29, 2024

pavolloffay Apr 29, 2024

iblancasa May 3, 2024

pavolloffay May 6, 2024

pavolloffay Apr 29, 2024

swiatekm left a comment

pavolloffay commented May 14, 2024

jaronoff97 left a comment

jaronoff97 May 17, 2024

iblancasa May 17, 2024

iblancasa commented May 17, 2024

jaronoff97 commented May 17, 2024

iblancasa commented May 19, 2024

Fix labels for Service Monitors #2878

Fix labels for Service Monitors #2878

Conversation

iblancasa commented Apr 18, 2024 • edited by pavolloffay Loading

iblancasa commented Apr 18, 2024

yuriolisa commented Apr 18, 2024

jaronoff97 left a comment

Choose a reason for hiding this comment

iblancasa commented Apr 18, 2024

pavolloffay commented Apr 24, 2024

IshwarKanse commented Apr 24, 2024

IshwarKanse commented Apr 26, 2024

jaronoff97 left a comment

Choose a reason for hiding this comment

pavolloffay Apr 29, 2024

Choose a reason for hiding this comment

pavolloffay Apr 29, 2024

Choose a reason for hiding this comment

iblancasa May 3, 2024

Choose a reason for hiding this comment

pavolloffay May 6, 2024

Choose a reason for hiding this comment

pavolloffay Apr 29, 2024

Choose a reason for hiding this comment

swiatekm left a comment

Choose a reason for hiding this comment

pavolloffay commented May 14, 2024

jaronoff97 left a comment

Choose a reason for hiding this comment

jaronoff97 May 17, 2024

Choose a reason for hiding this comment

iblancasa May 17, 2024

Choose a reason for hiding this comment

iblancasa commented May 17, 2024

jaronoff97 commented May 17, 2024

iblancasa commented May 19, 2024

iblancasa commented Apr 18, 2024 •

edited by pavolloffay

Loading