Fix static pods missing in the discovery.kubelet output #5645

masonmei · 2023-10-30T11:59:23Z

PR Description

Update the buildPodTargetGroup function in discovery.kubelet to hand containers that has no pod defined. This is useful for logs collecting with files in local.

Which issue(s) this PR fixes

Fixes #5644

Notes to the Reviewer

PR Checklist

CHANGELOG.md updated
Documentation added
Tests updated
Config converters updated

CLAassistant · 2023-10-30T11:59:29Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
23 out of 24 committers have signed the CLA.

✅ masonmei
✅ wildum
✅ rfratto
✅ ptodev
✅ schmikei
✅ thampiotr
✅ clayton-cornell
✅ hainenber
✅ tpaschalis
✅ erikbaranowski
✅ marctc
✅ rlankfo
✅ captncraig
✅ jkroepke
✅ petethepig
✅ spartan0x117
✅ StefanKurek
✅ harsiddhdave44
✅ joshuapare
✅ mcanevet
✅ thepalbi
✅ rootmout
✅ nicolai-hornung-bl
❌ github-actions[bot]
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

* component/prometheus: fix panic in interceptor when child isn't set This commit fixes a panic in prometheus.Interceptor where an interceptor which doesn't forward samples to another appendable panics when appending data. Co-authored-by: Edward Welch <[email protected]> * loki.source.kubernetes: improve detection of rolled log files Versions of Kubernetes that do not contain kubernetes/kubernetes#115702 will fail to detect rolled log files, causing the API to stop sending logs to the agent for processing. To work around this, this commit intorduces a rolling average calculator to determine the average delta between log entries per target. If 3x the normal delta time has elapsed since the last entry, the tailer is restarted. False positives here are acceptable, but false negatives mean that log lines may not appear for an extended period of time until the rolling detection succeeds. Closes #5040 Co-authored-by: Edward Welch <[email protected]> * loki.source.kubernetes: support clustering Add support for loki.source.kubernetes to distribute targets using clustering. Closes #4502 Co-authored-by: Edward Welch <[email protected]> * loki.source.podlogs: support clustering Add support for loki.source.podlogs to distribute targets using clustering. * service/cluster: add common block for clustering arguments * remove irrelevant TODO comment #5623 (comment) --------- Co-authored-by: Edward Welch <[email protected]>

* Clarify data collection * Clarify data collection done onlly in Static mode * Update links and add missing data collection * Fix broken link

* update oracledb-exporter to latest * retriggering drone CI

…5634) * Add an "exclude_event_message" argument to loki.source.windowsevent * Add a note with exact commit hash of Loki. --------- Co-authored-by: Paschalis Tsilias <[email protected]>

Co-authored-by: Paschalis Tsilias <[email protected]> Co-authored-by: Clayton Cornell <[email protected]>

rfratto

Makes sense to me!

Can you add this as an enhancement to the CHANGELOG.md at the root of the repository?

) Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.12.0 to 0.13.0. - [Release notes](https://github.com/aquasecurity/trivy-action/releases) - [Commits](aquasecurity/trivy-action@fbd1636...b77b85c) --- updated-dependencies: - dependency-name: aquasecurity/trivy-action 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>

Signed-off-by: Robbie Lankford <[email protected]>

…s metrics (#5632) * Add example with metrics * Update docs/sources/flow/reference/components/otelcol.processor.k8sattributes.md Co-authored-by: Clayton Cornell <[email protected]> --------- Co-authored-by: Clayton Cornell <[email protected]>

* Use raw strings for regexes in docs * Update note in beginning of doc --------- Co-authored-by: Clayton Cornell <[email protected]>

* feat(comp/otelcol): component to filter OTEL telemetry --------- Signed-off-by: hainenber <[email protected]> Co-authored-by: Paulin Todev <[email protected]> Co-authored-by: Clayton Cornell <[email protected]>

Signed-off-by: Paschalis Tsilias <[email protected]>

* initial wiring agent integration for integration-next Signed-off-by: erikbaranowski <[email protected]> --------- Signed-off-by: erikbaranowski <[email protected]>

* Update `make docs` procedure * Use single PR for all updates Signed-off-by: Jack Baldry <[email protected]> --------- Signed-off-by: Jack Baldry <[email protected]> Co-authored-by: grafanabot <[email protected]> Co-authored-by: Jack Baldry <[email protected]>

* NSIS: Add /CONFIG and /DISABLEREPORTING flag * Code review feedback * /DISABLEPROFILING * Update docs/sources/flow/setup/install/windows.md --------- Co-authored-by: mattdurham <[email protected]>

Co-authored-by: Clayton Cornell <[email protected]>

See this conversation https://raintank-corp.slack.com/archives/C03NCLB4GG7/p1698431277146729 for more context Co-authored-by: Clayton Cornell <[email protected]>

We now use project automation to add issues and don't need a Github Action for it anymore.

Bumps [helm/chart-testing-action](https://github.com/helm/chart-testing-action) from 2.3.1 to 2.4.0. - [Release notes](https://github.com/helm/chart-testing-action/releases) - [Commits](helm/chart-testing-action@v2.3.1...v2.4.0) --- updated-dependencies: - dependency-name: helm/chart-testing-action 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>

…5513) * build(deps): bump @babel/traverse from 7.21.5 to 7.23.2 in /web/ui Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.21.5 to 7.23.2. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse) --- updated-dependencies: - dependency-name: "@babel/traverse" dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * fix example config --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Robert Fratto <[email protected]>

* wire up apache exporter for static integrations-next converter Signed-off-by: erikbaranowski <[email protected]> * wire up azure exporter for integrations-next static converter Signed-off-by: erikbaranowski <[email protected]> --------- Signed-off-by: erikbaranowski <[email protected]>

…/ui (#5573) Bumps [@types/react-dom](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react-dom) from 18.2.4 to 18.2.14. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react-dom) --- updated-dependencies: - dependency-name: "@types/react-dom" dependency-type: direct:development 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>

) Co-authored-by: Robert Fratto <[email protected]>

Signed-off-by: hainenber <[email protected]> Co-authored-by: William Dumont <[email protected]> Co-authored-by: Paulin Todev <[email protected]> Co-authored-by: Paschalis Tsilias <[email protected]>

Signed-off-by: Paschalis Tsilias <[email protected]>

Bumps [github.com/hashicorp/vault/api/auth/gcp](https://github.com/hashicorp/vault) from 0.2.0 to 0.5.0. - [Release notes](https://github.com/hashicorp/vault/releases) - [Changelog](https://github.com/hashicorp/vault/blob/main/CHANGELOG-v0.md) - [Commits](hashicorp/vault@v0.2.0...v0.5.0) --- updated-dependencies: - dependency-name: github.com/hashicorp/vault/api/auth/gcp 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>

…() (#5704) The prometheus.remote_write basic_auth username is a string type and the agent will non start if the username is provided directly as a secret out of remote.kubernetes.secret. Co-authored-by: Clayton Cornell <[email protected]>

* Update `make docs` procedure * Use versioned action to update `make-docs` procedure https://github.com/grafana/writers-toolkit/blob/main/update-make-docs/action.yml Signed-off-by: Jack Baldry <[email protected]> --------- Signed-off-by: Jack Baldry <[email protected]> Co-authored-by: grafanabot <[email protected]> Co-authored-by: Jack Baldry <[email protected]>

* wire up blackbox exporter for integrations v2 converter Signed-off-by: erikbaranowski <[email protected]> * wire up cadvisor integration v2 for converter Signed-off-by: erikbaranowski <[email protected]> * wire up cloudwatch exporter for integrations v2 converter Signed-off-by: erikbaranowski <[email protected]> * wire up consul exporter for integrations v2 converter Signed-off-by: erikbaranowski <[email protected]> * wire up dnsmasq exporter for integrations v2 converter Signed-off-by: erikbaranowski <[email protected]> * wire up elasticsearch exporter for integrations v2 converter Signed-off-by: erikbaranowski <[email protected]> * wire up gcp exporter for integrations v2 converter Signed-off-by: erikbaranowski <[email protected]> * wire up github exporter for integrations v2 converter Signed-off-by: erikbaranowski <[email protected]> * wire up kafka exporter for integrations v2 converter Signed-off-by: erikbaranowski <[email protected]> * wire up memcached exporter for integrations v2 converter Signed-off-by: erikbaranowski <[email protected]> * wire up mongodb exporter for integrations v2 converter Signed-off-by: erikbaranowski <[email protected]> * wire up mssql exporter for integrations v2 exporter Signed-off-by: erikbaranowski <[email protected]> * wire up mysql exporter for integrations v2 converter Signed-off-by: erikbaranowski <[email protected]> * wire up node exporter for integrations v2 converter Signed-off-by: erikbaranowski <[email protected]> * wire up oracledb exporter for integrations v2 converter Signed-off-by: erikbaranowski <[email protected]> * wire up postgres exporter for integrations v2 converter Signed-off-by: erikbaranowski <[email protected]> * wire up process exporter for integrations v2 converter Signed-off-by: erikbaranowski <[email protected]> * wire up redis exporter for integrations v2 converter Signed-off-by: erikbaranowski <[email protected]> * wire up snmp exporter for integrations v2 converter Signed-off-by: erikbaranowski <[email protected]> * wire up snowflake exporter for integrations v2 converter Signed-off-by: erikbaranowski <[email protected]> * wire up squid exporter for integration v2 converter Signed-off-by: erikbaranowski <[email protected]> * wire up statsd exporter for integrations v2 converter Signed-off-by: erikbaranowski <[email protected]> * wire up windows exporter for integrations v2 converter Signed-off-by: erikbaranowski <[email protected]> * fix up windows test after running it in local windows --------- Signed-off-by: erikbaranowski <[email protected]>

Signed-off-by: Paschalis Tsilias <[email protected]>

tpaschalis · 2023-11-07T08:47:45Z

Hey @masonmei! I think something might have gone wrong during a recent rebase; can you re-check?

masonmei · 2023-11-08T06:04:44Z

Sure, I have dropped this pull and open a new one #5735

masonmei added 2 commits October 30, 2023 11:50

Fix Static pods missing in the discovery.kubelet output #5644

35efe89

Merge branch 'grafana:main' into master

a236383

masonmei requested a review from a team as a code owner October 30, 2023 11:59

masonmei changed the title ~~Fix static pods missing in the discovery.kubelet output #5644~~ Fix static pods missing in the discovery.kubelet output Oct 30, 2023

wildum and others added 7 commits October 30, 2023 16:06

remove integration-tests from windows unit tests in drone (#5643)

b131c20

fix integration test cache (#5647)

c9c27e9

Clarify data collection in Grafana Agent (#5656)

e08bcbb

* Clarify data collection * Clarify data collection done onlly in Static mode * Update links and add missing data collection * Fix broken link

update oracledb-exporter to latest (#5584)

c03bd07

* update oracledb-exporter to latest * retriggering drone CI

Add an "exclude_event_message" argument to loki.source.windowsevent (#…

8f94497

…5634) * Add an "exclude_event_message" argument to loki.source.windowsevent * Add a note with exact commit hash of Loki. --------- Co-authored-by: Paschalis Tsilias <[email protected]>

Sync loki.process drop stage (#5581)

dbec50f

Co-authored-by: Paschalis Tsilias <[email protected]> Co-authored-by: Clayton Cornell <[email protected]>

rfratto reviewed Oct 31, 2023

View reviewed changes

dependabot bot and others added 17 commits October 31, 2023 17:19

faro: include measurement type (#5654)

d5ba228

Signed-off-by: Robbie Lankford <[email protected]>

Use raw strings for regexes in otelcol docs (#5636)

7fc7653

* Use raw strings for regexes in docs * Update note in beginning of doc --------- Co-authored-by: Clayton Cornell <[email protected]>

feat(comp/otelcol): component to filter OTEL telemetry (#5562)

481674a

* feat(comp/otelcol): component to filter OTEL telemetry --------- Signed-off-by: hainenber <[email protected]> Co-authored-by: Paulin Todev <[email protected]> Co-authored-by: Clayton Cornell <[email protected]>

Fix bad links for Cloud to Flow (#5665)

a84f949

Use types from discovery Hetzner when converting configs (#5485)

f959470

Sync loki.process with latest Promtail code (#5677)

876fed7

Signed-off-by: Paschalis Tsilias <[email protected]>

initial wiring agent integration for integration-next (#5638)

33fbfc4

* initial wiring agent integration for integration-next Signed-off-by: erikbaranowski <[email protected]> --------- Signed-off-by: erikbaranowski <[email protected]>

NSIS: Add /CONFIG and /DISABLEREPORTING flag (#5666)

b475cac

* NSIS: Add /CONFIG and /DISABLEREPORTING flag * Code review feedback * /DISABLEPROFILING * Update docs/sources/flow/setup/install/windows.md --------- Co-authored-by: mattdurham <[email protected]>

chore: fix build agent under Windows (#5664)

59b7b69

prometheus.scraps: clarify docs on job label (#5680)

c2ecec3

Co-authored-by: Clayton Cornell <[email protected]>

pyroscope: fixes wrong memory profiling path (#5635)

a5e980b

See this conversation https://raintank-corp.slack.com/archives/C03NCLB4GG7/p1698431277146729 for more context Co-authored-by: Clayton Cornell <[email protected]>

[Agent Management] Support External Labels from API (#5670)

1c83946

ci: remove add-to-project workflow (#5691)

1bf1c3f

We now use project automation to add issues and don't need a Github Action for it anymore.

dependabot bot and others added 4 commits November 2, 2023 15:47

Adds new memory related metrics for mssql integration (#5668)

3683a95

erikbaranowski assigned rfratto Nov 2, 2023

joshuapare and others added 14 commits November 2, 2023 16:50

ensure syslog parser gets an EOF-terminated reader on udp receive (#5297

0a23b6d

) Co-authored-by: Robert Fratto <[email protected]>

Sortable header for component list in web UI (#5642)

d27f011

Signed-off-by: hainenber <[email protected]> Co-authored-by: William Dumont <[email protected]> Co-authored-by: Paulin Todev <[email protected]> Co-authored-by: Paschalis Tsilias <[email protected]>

feat: add controller annotations (#5649)

00cb90f

loki/wal: fix panic for duplicate registered metrics (#5705)

7817c22

Signed-off-by: Paschalis Tsilias <[email protected]>

config-reloader: change to non-root user (#4235)

7fe5023

update changelog and add container id to the discovery.kubelet result

85613d6

Update code references for v0.37.4 (#5718)

3a2d6d5

Signed-off-by: Paschalis Tsilias <[email protected]>

Fix Static pods missing in the discovery.kubelet output #5644

02122d8

update changelog and add container id to the discovery.kubelet result

1e84b8a

Merge branch 'master' of https://github.com/masonmei/agent

1572c38

masonmei requested review from a team, clayton-cornell and jdbaldry as code owners November 7, 2023 05:41

masonmei closed this by deleting the head repository Nov 8, 2023

github-actions bot added the frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. label Feb 21, 2024

github-actions bot locked as resolved and limited conversation to collaborators Feb 21, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix static pods missing in the discovery.kubelet output #5645

Fix static pods missing in the discovery.kubelet output #5645

masonmei commented Oct 30, 2023 •

edited

Loading

CLAassistant commented Oct 30, 2023 •

edited

Loading

rfratto left a comment

tpaschalis commented Nov 7, 2023

masonmei commented Nov 8, 2023

Fix static pods missing in the discovery.kubelet output #5645

Fix static pods missing in the discovery.kubelet output #5645

Conversation

masonmei commented Oct 30, 2023 • edited Loading

PR Description

Which issue(s) this PR fixes

Notes to the Reviewer

PR Checklist

CLAassistant commented Oct 30, 2023 • edited Loading

rfratto left a comment

Choose a reason for hiding this comment

tpaschalis commented Nov 7, 2023

masonmei commented Nov 8, 2023

masonmei commented Oct 30, 2023 •

edited

Loading

CLAassistant commented Oct 30, 2023 •

edited

Loading