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.

Sign up for GitHub

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

fix: update monitor mutation to not overwrite explicitly defined scrape class #582

Merged
merged 7 commits into from
Jul 19, 2024
Merged

fix: update monitor mutation to not overwrite explicitly defined scrape class #582

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1dcc00f
fix monitor mutation to not overwrite explicitly defined scrapeClass
zachariahmiller Jul 16, 2024
0a3b92d
redo pepr format
zachariahmiller Jul 16, 2024
00c7d4c
refactor based on review comment
zachariahmiller Jul 17, 2024
a1a80df
Merge branch 'main' into monitor_mutation_patch
mjnagel Jul 17, 2024
683adcd
Merge branch 'main' into monitor_mutation_patch
mjnagel Jul 17, 2024
a491ae8
Merge branch 'main' into monitor_mutation_patch
mjnagel Jul 18, 2024
2d00b2b
Merge branch 'main' into monitor_mutation_patch
mjnagel Jul 19, 2024
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
8 changes: 5 additions & 3 deletions src/pepr/prometheus/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import {
ServiceMonitorEndpoint,
ServiceMonitorScheme,
} from "../operator/crd";

// configure subproject logger
const log = setupLogger(Component.PROMETHEUS);

Expand All @@ -25,7 +24,7 @@ const { When } = prometheus;
When(PrometheusServiceMonitor)
.IsCreatedOrUpdated()
.Mutate(async sm => {
if (sm.Raw.spec === undefined) {
if (sm.Raw.spec === undefined || sm.Raw.spec.scrapeClass != undefined) {
return;
}

Expand All @@ -39,6 +38,7 @@ When(PrometheusServiceMonitor)
`Mutating scrapeClass to exempt ServiceMonitor ${sm.Raw.metadata?.name} from default scrapeClass mTLS config`,
);
sm.Raw.spec.scrapeClass = "exempt";

return;
} else {
log.info(`Patching service monitor ${sm.Raw.metadata?.name} for mTLS metrics`);
Expand All @@ -64,7 +64,7 @@ When(PrometheusServiceMonitor)
When(PrometheusPodMonitor)
.IsCreatedOrUpdated()
.Mutate(async pm => {
if (pm.Raw.spec === undefined) {
if (pm.Raw.spec === undefined || pm.Raw.spec.scrapeClass != undefined) {
return;
}

Expand All @@ -74,6 +74,7 @@ When(PrometheusPodMonitor)
`Mutating scrapeClass to exempt PodMonitor ${pm.Raw.metadata?.name} from default scrapeClass mTLS config`,
);
pm.Raw.spec.scrapeClass = "exempt";

return;
} else {
log.info(`Patching pod monitor ${pm.Raw.metadata?.name} for mTLS metrics`);
Expand Down Expand Up @@ -102,5 +103,6 @@ async function isIstioInjected(monitor: PrometheusServiceMonitor | PrometheusPod
return true;
}
}

return false;
}