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

Add Deploy Mode to usage stats. #5880

Merged
merged 6 commits into from
Nov 29, 2023
Merged

Add Deploy Mode to usage stats. #5880

merged 6 commits into from
Nov 29, 2023

Conversation

captncraig
Copy link
Contributor

With 0.38.0 we added a deploy mode to the user agent, and added ways to set it, but we did not add it to the usage stats, which would be very useful. This adds it.

Also makes a best-effort attempt to detect homebrew installs, by looking t the executable path.

jcreixell
jcreixell reviewed Nov 29, 2023
View reviewed changes
Copy link
Contributor

@jcreixell jcreixell left a comment

Choose a reason for hiding this comment

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

could you please add a test here? other than that, LGTM

rfratto
rfratto reviewed Nov 29, 2023
View reviewed changes
Copy link
Member

@rfratto rfratto left a comment

Choose a reason for hiding this comment

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

You'll need to update this page: https://grafana.com/docs/agent/latest/data-collection/

And add this in the CHANGELOG, since we promised we'd do that any time list of collected data changes.

@captncraig
Copy link
Contributor Author

Added tests and transparency.

@clayton-cornell clayton-cornell added the type/docs Docs Squad label across all Grafana Labs repos label Nov 29, 2023
@captncraig captncraig enabled auto-merge (squash) November 29, 2023 19:17
rfratto
rfratto approved these changes Nov 29, 2023
View reviewed changes
Copy link
Member

@rfratto rfratto left a comment

Choose a reason for hiding this comment

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

LGTM once Clayton approves docs

@captncraig captncraig merged commit 7bf82ea into main Nov 29, 2023
9 checks passed
@captncraig captncraig deleted the cmp_deploy_usage branch November 29, 2023 19:27
rfratto pushed a commit to rfratto/agent that referenced this pull request Nov 30, 2023
@captncraig @rfratto
Add Deploy Mode to usage stats. (grafana#5880)
80ab145 
Co-authored-by: Clayton Cornell <[email protected]>
(cherry picked from commit 7bf82ea)
rfratto added a commit that referenced this pull request Nov 30, 2023
@rfratto @cedricziel
@jcreixell @korniltsev @mattdurham @hainenber @captncraig @thampiotr
[release-v0.38] Prepare for v0.38.1 release (#5893)
15e3e86 
* Allow x-faro-session-id header for faro receiver (#5835)

(cherry picked from commit cc7cb37)

* misc: follow up on #5835 (#5837)

* Add missing CHANGELOG entry
* Mirror fix to static mode

(cherry picked from commit 7da5726)

* Agent Management: Introduce support for template variables (#5788)

* Agent Management: Introduce support for template variables

  - This change allows managing template variables for remote
    configuration on a per-agent basis.
  - Both base configurations and snippets can be interpreted as
    templates and evaluated at load time with the provided template
    variables.
  - Templates must follow go's `text/template` syntax.
  - This greatly increases the flexibility and reusability of snippets.
  - Template evaluation has been tested in different scenarios and seems
    really robust. If the variables defined in the template cannot be
    resolved (even nested ones), and empty string is rendered
    instead.
  - Note: templates are only evaluated when the `template_variables`
    field within the `agent_metadata` remote config field is non-empty.
  - Note: this feature only applies to static mode.

* Improve naming

* Check error for template execution

* Add tests

  - Tests different scenarios, including:
    - Referencing non existing nested objects
    - Conditionals
    - Ranges
    - Character escaping

* Update CHANGELOG

* Always evaluate templates

  - This is required because certain agents might start before their
    labels are synced. If some of the snippets assigned to them contain
    template variables, loading the config will fail.

* Add test for template inside a template

  - Templates inside templates must be escaped using backticks to avoid
    them being evaluated by the snippet template execution

* Move feature to the next release in CHANGELOG

* Document templating functionality

* Fix doc

(cherry picked from commit d388f94)

* pyroscope.scrape: change error log level to not swallow errors (#5840)

(cherry picked from commit 2242e4a)

* Update windows defaults to use upstream defaults except for enabled collectors. (#5832)

Fix #5831 and use the defaults from windows.

(cherry picked from commit 15d3d9f)

* Bump otelgrpc to fix CVE 2023 47108 (#5806)

* Fix CVE-2023-47108 by updating `otelgrpc` from v0.45.0 to v0.46.0.

* Stop using the deprecated trace.NewNoopTracerProvider.
  Using noop.NewTracerProvider from
  "go.opentelemetry.io/otel/trace/noop" instead.

* Reorder changelog
  Comply with the ordering in:
  https://github.com/grafana/agent/blob/main/docs/developer/contributing.md#updating-the-changelog

---------

Signed-off-by: hainenber <[email protected]>
Co-authored-by: Paulin Todev <[email protected]>
(cherry picked from commit a2348a0)

* fix(otelcol/fanoutconsumer): nil check during fanout consumer creation (#5854)

Signed-off-by: hainenber <[email protected]>
(cherry picked from commit 84344fb)

* prometheus.operator.* - Fix issue with missing targets when one monitor's name is a prefix of another (#5862)

Co-authored-by: Paul Bormans <[email protected]>
(cherry picked from commit f232fb4)

* max_cache_size was being set to 0 (#5869)

* max_cache_size was being set to 0, due to issue where it doesnt exist in static but the default wasnt carrying over to river syntax. In truth we should never write it.

* Clean up from PR

(cherry picked from commit 356c50c)

* Add Deploy Mode to usage stats. (#5880)

Co-authored-by: Clayton Cornell <[email protected]>
(cherry picked from commit 7bf82ea)

* Fix promtail converter: docker_sd_configs (#5881)

* Fix promtail converter: docker_sd

* changelog and lint

* typo

(cherry picked from commit c5dc968)

* prepare for 0.38.1 release (#5891)

(cherry picked from commit fc2fd5b)

* fix misplaced CHANGELOG entry for #5869

---------

Co-authored-by: Cedric Ziel <[email protected]>
Co-authored-by: Jorge Creixell <[email protected]>
Co-authored-by: Tolya Korniltsev <[email protected]>
Co-authored-by: mattdurham <[email protected]>
Co-authored-by: Đỗ Trọng Hải <[email protected]>
Co-authored-by: Craig Peterson <[email protected]>
Co-authored-by: Piotr <[email protected]>
BarunKGP pushed a commit to BarunKGP/grafana-agent that referenced this pull request Feb 20, 2024
@captncraig @clayton-cornell @BarunKGP
Add Deploy Mode to usage stats. (grafana#5880)
3d94e16 
Co-authored-by: Clayton Cornell <[email protected]>
@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 21, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 21, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@clayton-cornell clayton-cornell clayton-cornell left review comments

@jcreixell jcreixell jcreixell left review comments

@rfratto rfratto rfratto approved these changes

Assignees
No one assigned
Labels
frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. type/docs Docs Squad label across all Grafana Labs repos
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@captncraig @rfratto @jcreixell @clayton-cornell