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

Jump to bottom

update(falco_metrics): rearrange evts and drops prometheus metrics #3319

Merged
merged 6 commits into from
Sep 12, 2024
Merged

update(falco_metrics): rearrange evts and drops prometheus metrics #3319

merged 6 commits into from
Sep 12, 2024

Conversation

incertum
Copy link
Contributor

@incertum incertum commented Sep 11, 2024 •
edited by leogr
Loading

What type of PR is this?

Uncomment one (or more) /kind <> lines:

/kind bug

/kind cleanup

/kind design

/kind documentation

/kind failing-test

/kind feature

/kind release

Any specific area of the project related to this PR?

Uncomment one (or more) /area <> lines:

/area build

/area engine

/area tests

/area proposals

/area CI

What this PR does / why we need it:

Rearrange evts and drops prometheus metrics,
Fixes #3309

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

update(falco_metrics)!: rearrange `n_evts_cpu` and `n_drops_cpu` Prometheus metrics to follow best practices

@poiana poiana requested review from Kaizhe and leogr September 11, 2024 06:01
@incertum incertum added this to the 0.39.0 milestone Sep 11, 2024
@poiana poiana added the size/M label Sep 11, 2024
@github-actions GitHub Actions
Copy link

This PR may bring feature or behavior changes in the Falco engine and may require the engine version to be bumped.

Please double check userspace/engine/falco_engine_version.h file. See versioning for FALCO_ENGINE_VERSION.

/hold

@leogr
Copy link
Member

leogr commented Sep 11, 2024

This PR may bring feature or behavior changes in the Falco engine and may require the engine version to be bumped.

Please double check userspace/engine/falco_engine_version.h file. See versioning for FALCO_ENGINE_VERSION.

/hold

false positive
/unhold

incertum and others added 5 commits September 12, 2024 05:59
@incertum
update(falco_metrics): rearrange evts and drops prometheus metrics
85820a0 
Signed-off-by: Melissa Kilby <melissa.kilby.oss@gmail.com>
@incertum @FedeDP
update(falco_metrics): apply reviewers suggestions
d804033 
Co-authored-by: Federico Di Pierro <nierro92@gmail.com>
Signed-off-by: Melissa Kilby <melissa.kilby.oss@gmail.com>
@incertum
update(falco_metrics): adjust sha256 prometheus name, remove double f…
f68ba03 
…alco_

Signed-off-by: Melissa Kilby <melissa.kilby.oss@gmail.com>
@incertum
update(Falco_metrics): fix prom subsystem for some scap vs falco metrics
fe86c1f 
Signed-off-by: Melissa Kilby <melissa.kilby.oss@gmail.com>
@incertum
update(falco_metrics): add kernel_event_counters_per_cpu_enabled config
4c4dd8f 
Signed-off-by: Melissa Kilby <melissa.kilby.oss@gmail.com>
@incertum incertum force-pushed the metrics-prom-rearrange branch from fcc5bea to 4c4dd8f Compare September 12, 2024 07:16
@poiana poiana added size/L and removed size/M labels Sep 12, 2024
incertum
incertum commented Sep 12, 2024
View reviewed changes
falco.yaml
@@ -1104,6 +1107,8 @@ metrics:
resource_utilization_enabled: true
state_counters_enabled: true
kernel_event_counters_enabled: true
# Enabling `kernel_event_counters_per_cpu_enabled` automatically enables `kernel_event_counters_enabled`
kernel_event_counters_per_cpu_enabled: false
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CC @Andreagit97

leogr
leogr previously approved these changes Sep 12, 2024
View reviewed changes
@poiana poiana added the lgtm label Sep 12, 2024
@poiana
Copy link
Contributor

poiana commented Sep 12, 2024

LGTM label has been added.

Git tree hash: 24742cf5f96f291719abfc5df28075d529eebf4a

FedeDP
FedeDP previously approved these changes Sep 12, 2024
View reviewed changes
Copy link
Contributor

@FedeDP FedeDP left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

@FedeDP
chore(userspace/falco): updated configuration schema.
fd7e911 
Signed-off-by: Federico Di Pierro <nierro92@gmail.com>
@FedeDP FedeDP dismissed stale reviews from leogr and themself via fd7e911 September 12, 2024 12:58
@poiana poiana removed the lgtm label Sep 12, 2024
@poiana poiana requested review from FedeDP and leogr September 12, 2024 12:58
FedeDP
FedeDP approved these changes Sep 12, 2024
View reviewed changes
Copy link
Contributor

@FedeDP FedeDP left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

@poiana poiana added the lgtm label Sep 12, 2024
@poiana
Copy link
Contributor

poiana commented Sep 12, 2024

LGTM label has been added.

Git tree hash: 5bffc3eaa3ba5df308fc905ffb0080794d446c1a

@poiana
Copy link
Contributor

poiana commented Sep 12, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: FedeDP, incertum

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@poiana poiana merged commit d164407 into falcosecurity:master Sep 12, 2024
35 of 36 checks passed
@FedeDP FedeDP mentioned this pull request Sep 16, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FedeDP FedeDP FedeDP approved these changes

@leogr leogr leogr approved these changes

@Kaizhe Kaizhe Awaiting requested review from Kaizhe

Assignees

@leogr leogr

@FedeDP FedeDP

Labels
approved area/engine dco-signoff: yes kind/cleanup lgtm release-note size/L
Projects
Falco Roadmap
Status: Done
Milestone
0.39.0
Development

Successfully merging this pull request may close these issues.

Metrics: merge different metrics into series + labels
4 participants
@incertum @leogr @poiana @FedeDP