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.

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

flow: only use component health when component implements component.HealthComponent #3740

Merged
merged 2 commits into from
May 1, 2023

Conversation

rfratto
Copy link
Member

@rfratto rfratto commented May 1, 2023

This commit offers an alternative approach to #3558, where the overall health of a component only considers the component implementation of health if that component implements the component.HealthComponent interface.

It also has the benefit of reducing the overall public API surface.

This reverts commit b2f8992. The previous commit introduced a bug where the "default health" message was always returned for healthy components, overriding the message informing the user when the last time the component evaluated was.

rfratto added 2 commits May 1, 2023 15:56
…omponent.HealthComponent (grafana#3558)"

This reverts commit b2f8992. The commit
introduced a bug where the "default health" message was always returned
for healthy components, overriding the message informing the user when
the last time the component evaluated was.
This commit offers an alernative approach to grafana#3558, where the overall
health of a component only considers the component implementation of
health if that component implements the component.HealthComponent
interface.

Without this commit, the zero value of component.Health was always
returned, considering the health of every component as being "unknown."
@rfratto rfratto requested a review from erikbaranowski May 1, 2023 19:57
Copy link
Contributor

@erikbaranowski erikbaranowski left a comment

Choose a reason for hiding this comment

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

LGTM, much better!

@rfratto rfratto merged commit ff2ca95 into grafana:main May 1, 2023
@rfratto rfratto deleted the rework-3558 branch May 1, 2023 20:21
thampiotr pushed a commit that referenced this pull request May 2, 2023
…ealthComponent (#3740)

* Revert "Default back to healthy when a component does not implement component.HealthComponent (#3558)"

This reverts commit b2f8992. The commit
introduced a bug where the "default health" message was always returned
for healthy components, overriding the message informing the user when
the last time the component evaluated was.

* flow: only use component health if component exposes health

This commit offers an alernative approach to #3558, where the overall
health of a component only considers the component implementation of
health if that component implements the component.HealthComponent
interface.

Without this commit, the zero value of component.Health was always
returned, considering the health of every component as being "unknown."
captncraig pushed a commit that referenced this pull request May 11, 2023
…ealthComponent (#3740)

* Revert "Default back to healthy when a component does not implement component.HealthComponent (#3558)"

This reverts commit b2f8992. The commit
introduced a bug where the "default health" message was always returned
for healthy components, overriding the message informing the user when
the last time the component evaluated was.

* flow: only use component health if component exposes health

This commit offers an alernative approach to #3558, where the overall
health of a component only considers the component implementation of
health if that component implements the component.HealthComponent
interface.

Without this commit, the zero value of component.Health was always
returned, considering the health of every component as being "unknown."
rfratto added a commit to rfratto/agent that referenced this pull request May 11, 2023
…ealthComponent (grafana#3740)

* Revert "Default back to healthy when a component does not implement component.HealthComponent (grafana#3558)"

This reverts commit b2f8992. The commit
introduced a bug where the "default health" message was always returned
for healthy components, overriding the message informing the user when
the last time the component evaluated was.

* flow: only use component health if component exposes health

This commit offers an alernative approach to grafana#3558, where the overall
health of a component only considers the component implementation of
health if that component implements the component.HealthComponent
interface.

Without this commit, the zero value of component.Health was always
returned, considering the health of every component as being "unknown."

(cherry picked from commit ff2ca95)
rfratto added a commit that referenced this pull request May 11, 2023
* flow: only use component health when component implements component.HealthComponent (#3740)

* Revert "Default back to healthy when a component does not implement component.HealthComponent (#3558)"

This reverts commit b2f8992. The commit
introduced a bug where the "default health" message was always returned
for healthy components, overriding the message informing the user when
the last time the component evaluated was.

* flow: only use component health if component exposes health

This commit offers an alernative approach to #3558, where the overall
health of a component only considers the component implementation of
health if that component implements the component.HealthComponent
interface.

Without this commit, the zero value of component.Health was always
returned, considering the health of every component as being "unknown."

(cherry picked from commit ff2ca95)

* cluster: honor deadline when opening TCP connection (#3764)

Although synchronous writes to peers have a timeout, this timeout only
affected the HTTP/2 request and not the net.Dial call. This commit
attempts to honor the deadline when establishing a connection to a peer,
otherwise it falls back to a default timeout of 30s.

(cherry picked from commit f4c0e06)

* Fix windows container pointing at the wrong location for config (#3775)

* fix windows container image

Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com>

* Fix an issue with the windows grafana/agent windows docker image entrypoint
  not targeting the right location for the config.

Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com>

---------

Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com>
(cherry picked from commit a7319fc)

* node_exporter: fix usage of diskstat flags (#3760)

Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com>
(cherry picked from commit 6e4d3d6)

* agent-flow: fix S3 object fetch when path has parent directories (#3800)

* agent-flow: fix S3 object fetch when path has parent directories

Signed-off-by: Jasti Sri Radhe Shyam <samabhasatejsrs@outlook.com>

* add unit test case for S3 path parsing functionality and bug fix entry in changelog

Signed-off-by: Jasti Sri Radhe Shyam <samabhasatejsrs@outlook.com>

---------

Signed-off-by: Jasti Sri Radhe Shyam <samabhasatejsrs@outlook.com>
Co-authored-by: mattdurham <mattdurham@ppog.org>
(cherry picked from commit 0dda0ba)

* misc: cherry-pick prometheus/prometheus#12349 (#3853)

Fixes #3826

(cherry picked from commit b555681)

* add logging if we fail to update a controller in operator (#3854)

(cherry picked from commit 07cc2f4)

* Update log level for a phlare.scrape log (#3813)

* Update log level for a phlare.scrape log

Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com>

* changelog

Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com>

* Update CHANGELOG.md

Co-authored-by: Robert Fratto <robertfratto@gmail.com>

---------

Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com>
Co-authored-by: Robert Fratto <robertfratto@gmail.com>
(cherry picked from commit 9845ddd)

* Make sure labels are cloned from loki.source.kubernetes (#3861)

* Make sure labels are cloned from loki.source.kubernetes

Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com>

* Add changelog entry

Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com>

---------

Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com>
(cherry picked from commit 8fb5be1)

* update refs for v0.33.2

---------

Co-authored-by: Erik Baranowski <39704712+erikbaranowski@users.noreply.github.com>
Co-authored-by: Paschalis Tsilias <tpaschalis@users.noreply.github.com>
Co-authored-by: Jasti Sri Radhe Shyam <15701495+jastisriradheshyam@users.noreply.github.com>
Co-authored-by: Craig Peterson <192540+captncraig@users.noreply.github.com>
clayton-cornell pushed a commit that referenced this pull request Aug 14, 2023
…ealthComponent (#3740)

* Revert "Default back to healthy when a component does not implement component.HealthComponent (#3558)"

This reverts commit b2f8992. The commit
introduced a bug where the "default health" message was always returned
for healthy components, overriding the message informing the user when
the last time the component evaluated was.

* flow: only use component health if component exposes health

This commit offers an alernative approach to #3558, where the overall
health of a component only considers the component implementation of
health if that component implements the component.HealthComponent
interface.

Without this commit, the zero value of component.Health was always
returned, considering the health of every component as being "unknown."
clayton-cornell pushed a commit that referenced this pull request Aug 14, 2023
…ealthComponent (#3740)

* Revert "Default back to healthy when a component does not implement component.HealthComponent (#3558)"

This reverts commit b2f8992. The commit
introduced a bug where the "default health" message was always returned
for healthy components, overriding the message informing the user when
the last time the component evaluated was.

* flow: only use component health if component exposes health

This commit offers an alernative approach to #3558, where the overall
health of a component only considers the component implementation of
health if that component implements the component.HealthComponent
interface.

Without this commit, the zero value of component.Health was always
returned, considering the health of every component as being "unknown."
@github-actions 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 27, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants