Skip to content
This repository was archived by the owner on Jul 28, 2026. It is now read-only.

Clean up K8s deployment methods - #749

Merged
rfratto merged 6 commits into
mainfrom
deployment_cleanup
Jul 19, 2021
Merged

Clean up K8s deployment methods#749
rfratto merged 6 commits into
mainfrom
deployment_cleanup

Conversation

@hjet

@hjet hjet commented Jul 16, 2021

Copy link
Copy Markdown
Contributor
  • Updates README directing users to Graf Cloud docs for full instructions
  • Removes generation of agent.yaml and agent-sigv4.yaml from build script
  • Removes generated agent.yaml and agent-sigv4.yaml
  • Updates logs Tanka to remove ConfigMap (moved to Graf Cloud docs)
  • Removes install scripts

PR Checklist

  • CHANGELOG updated
  • Documentation added
  • Tests updated

- Updates README directing users to Graf Cloud docs for full instructions
- Removes generation of `agent.yaml` and `agent-sigv4.yaml` from build script
- Removes generated `agent.yaml` and `agent-sigv4.yaml`
- Updates logs Tanka to remove ConfigMap (moved to Graf Cloud docs)
- Removes install scripts
@CLAassistant

CLAassistant commented Jul 16, 2021

Copy link
Copy Markdown

CLA assistant check
All committers have signed the CLA.

@hjet

hjet commented Jul 16, 2021

Copy link
Copy Markdown
Contributor Author

@rfratto also tagging you on the logs docs PR

@hjet
hjet requested a review from rfratto July 16, 2021 17:51
@hjet

hjet commented Jul 16, 2021

Copy link
Copy Markdown
Contributor Author

Dead link is a chicken-egg with https://github.com/grafana/website/pull/5248

@rfratto rfratto left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks!

Comment thread production/README.md
@hjet

hjet commented Jul 16, 2021

Copy link
Copy Markdown
Contributor Author

Dead links will be fixed by https://github.com/grafana/website/pull/5258, I guess we'll wait for that to get in first on Monday (cc @matthewhelmke)

@rfratto

rfratto commented Jul 19, 2021

Copy link
Copy Markdown
Contributor

Looks like the links are still broken, does this need to be updated again?

@hjet

hjet commented Jul 19, 2021

Copy link
Copy Markdown
Contributor Author

Yeah just pushed a fix, the manifests were referenced in another spot

@hjet

hjet commented Jul 19, 2021

Copy link
Copy Markdown
Contributor Author

Should have tracing done by EOD (but doesn't block this PR)

@rfratto rfratto left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks!

@rfratto
rfratto merged commit 254819f into main Jul 19, 2021
@rfratto
rfratto deleted the deployment_cleanup branch July 19, 2021 19:04
mattdurham pushed a commit that referenced this pull request Jul 22, 2021
* Cleans up some deployment methods:

- Updates README directing users to Graf Cloud docs for full instructions
- Removes generation of `agent.yaml` and `agent-sigv4.yaml` from build script
- Removes generated `agent.yaml` and `agent-sigv4.yaml`
- Updates logs Tanka to remove ConfigMap (moved to Graf Cloud docs)
- Removes install scripts

* Update production/README.md

* Add link

* Update links

* Fix broken links and update doc

* Add line to direct users to quickstart guides
mattdurham added a commit that referenced this pull request Jul 22, 2021
* Initialize biggest ref to existing ref when reading a segment (#676)

* initialize biggest ref to existing ref when reading a segment

* changelog

* allow new test to be less hard-coded

* explain error if test fails

* clarify changelog issue

* prepare for v0.16.1 release (#679)

* adding docker-compose example for local testing

(cherry picked from commit 992e3cf)

* Cherry picking kafka importer

* update Operator FAQ to describe custom scrape jobs (#658)

* Merge

* merge for race condition

* Wall cherry pick

* Import Kafka

* Bump version number to v0.17.0

* Add TLS config options for tempo remote_write (#666)

* Add TLS config options for tempo s

* cleanup

* Apply suggestions

* Rebase

* Update operator to use v0.16.1 by default (#681)

* update operator to use v0.16.1 by default

* changelog

* improve changelog phrasing?

* Add OTLP HTPP exporter support (#683)

* Tanka Jsonnet Integrations Fixes (#698)

* Hack the integrationsmixin to be always applied

* Remove hack which always applies integrations mixin. Fix copy/pasta

* Conditionally mutate agent daemonset or deployment when node_exporter integration is enabled

* document horizontal scaling (#696)

* document horizontal scaling

* clean up format of pros/cons

* Upgrade otel to v0.29.0 (#700)

* Upgrade otel to v0.29.0

Using grafana's fork which removes internal folders.

Signed-off-by: Mario Rodriguez <mariorvinas@gmail.com>

* Changelog

Signed-off-by: Mario Rodriguez <mariorvinas@gmail.com>

* Explain fork

* renamed guide and updated headings (#704)

* Docs: Getting started (#705)

* moved docs

* Update docs/getting-started/_index.md

Co-authored-by: Robert Fratto <robert.fratto@grafana.com>

Co-authored-by: Robert Fratto <robert.fratto@grafana.com>

* Docs: automatic logging is at the top level of instance config (#711)

See the actual config struct
https://github.com/grafana/agent/blob/50efa00ac3edeec52353549d4e786126cbd35370/pkg/tempo/config.go#L107-L137

* Docs: Configuration (#712)

* moved file

* added server-config.md

* added prometheus-config.md

* Create loki-config.md

* Update configuration-reference.md

* Create tempo-config.md

* added integrations-config

* updated links

* Update grafana-agent config regex replacement (#707)

This PR fixes an issue that users of config.expand-env face.

* moved and renamed files (#706)

* trigger reload configuration using SIGHUP (#710)

* trigger reload configuration using SIGHUP

* fix review changes - stop and close signal on defer

* add changelog for reloading config using SIGHUP

* add post method for config reload api (#709)

* move maintainers guide out of docs (#714)

move each to cmd/<project>/DEVELOPERS.md

* Add github action job to check if links in docs are correct (#708)

* Add debug log in prom-sd processor to indicate missing ip tag (#718)

Signed-off-by: Annanay <annanay.agarwal@grafana.com>

* Update dashboards setup in production mixin. (#685)

This changes the following:
- fix `Scrape failures` queries to use the proper variables like the
  rest of queries
- add `grafana-agent-mixin` tag to all dashboards to allow easy link
  and discovery

* fix race condition in initializing cluster (#690)

* Docs: More cleanup (#720)

* added metadata and renamed

* Update scraping-service.md

* Update operation-guide.md

* edits

* Update _index.md

* Update loki-config.md

* Update _index.md

* Update prometheus-config.md

* Create create-config-file.md

* Update _index.md

* Update architecture.md

* Update getting-started.md

* Update README.md

* Update README.md

* Update _index.md

* Operator: create CRDs for logging (#721)

* operator: create CRDs for logging

* fix lint nits

* Docs: Integrations (#723)

* content edits

* Create consul-exporter-config.md

* Create statsd-exporter-config.md

* Create postgres-exporter-config.md

* Create memcached-exporter-config.md

* Create elasticsearch-exporter-config.md

* Create dnsmasq-exporter-config.md

* Create redis-exporter-config.md

* Create mysqld-exporter-config.md

* Create process-exporter-config.md

* Create node-exporter-config.md

* Update _index.md

* Update api.md

* Update operation-guide.md

* Update operation-guide.md

* remove duplicated config blobs (#719)

* Remove duplicated blobs from Prometheus and link to Prometheus
* Move tls config entry to server-config where it belongs
* Use consistent strategy for linking to external documentation

* Docs: change operator custom scrape jobs example to use integrations job_name (#726)

* update operator custom scrape jobs example to use integrations-specific job_name

* add known issue

* add rollout command corresponding to getting started guide

* Set DNSPolicy correctly when host network is used in daemonset (#728)

* Rename "loki" to "logs" (#727)

* Embedding Kafka Lag Exporter (#674)

* Embedding the Kafka Lag Exporter

* update default config

* changelog and docs updated

* removing tabs from doc file

* removing tabs from doc file

* solving naming standards and identiation issues, adding defaults according to the documentation and checks for mandatory config flags

* Embedding the Kafka Lag Exporter

* update default config

* changelog merged

* removing tabs from doc file

* removing tabs from doc file

* solving naming standards and identiation issues, adding defaults according to the documentation and checks for mandatory config flags

* some other renames and identations

* fixing misspelling

* fixing field names and docs

* Remove trailing empty line

Co-authored-by: Robert Fratto <robert.fratto@grafana.com>

* adding docker-compose example for local testing

* Merge from main and reformat config

Co-authored-by: Robert Fratto <robert.fratto@grafana.com>
Co-authored-by: Matt Durham <mattdurham@ppog.org>

* Support autologging span attributes as loki labels (#703)

* Support autologging span attributes as log labels

* Update test

* Fix test

* apply suggestions

Signed-off-by: Mario Rodriguez <mariorvinas@gmail.com>

* Faster stringify

* Support no keyvalues

* Correctly size map

* Fix config

* Skip STATUS_CODE_UNSET to be less spammy

* Fix tests

* Use struct map

* Fix rebase

* Improve docs

* Apply suggestions

* yeah, don't change that

* Grafana Agent Operator: generate logs config (#740)

* wip generate logging config

* generate log client

* generate config for pipelines

* generate pod logs

* fix lint error

* buckets precision warning

* crds: denote required fields, fix typos

* buffer notifier channel (#744)

* Clean up K8s deployment methods (#749)

* Cleans up some deployment methods:

- Updates README directing users to Graf Cloud docs for full instructions
- Removes generation of `agent.yaml` and `agent-sigv4.yaml` from build script
- Removes generated `agent.yaml` and `agent-sigv4.yaml`
- Updates logs Tanka to remove ConfigMap (moved to Graf Cloud docs)
- Removes install scripts

* Update production/README.md

* Add link

* Update links

* Fix broken links and update doc

* Add line to direct users to quickstart guides

* Add install-bare.sh warning (#752)

* add install-bare.sh warning

* use emoji to make warning more warning-er

* Ignore regex capture groups when expanding environment vars (#754)

* ignore regex capture groups when expanding environment vars

* document behavior of regex capture group coercion

* remove weird formatting in changelog

* Implement Drone Build system, moving away from release via Github Actions (#732)

* Initial drone support

* Fix drone file

* Drone changes

* Added support for drone building

* Echo from makefile

* Add logging info

* Add logging info

* Add logging info

* Add debugging info

* Add make debugging info

* Add seego debugging

* add ls to see why files arent getting copied

* More debugging

* simplify

* Drone changes

* Drone v2


Former-commit-id: 914b4a3

* Remove invalid files


Former-commit-id: 7426669

* Fix freebsd build


Former-commit-id: 8f1fc64

* Setting up tokens


Former-commit-id: 246be58

* Removing windows build output


Former-commit-id: 241d9bb

* Fix for docker builds


Former-commit-id: 3babea6

* Remove containerize no docker


Former-commit-id: 90660b5

* Make buildx single threaded


Former-commit-id: e1fa585

* Building against personal docker account


Former-commit-id: 83bb1cc

* Merge changes


Former-commit-id: f6b8df9

* Remove exe


Former-commit-id: 79ce552

* Removed V6 temporarily to see if fixed


Former-commit-id: e6c5680

* Removed extra steps


Former-commit-id: cb89f55

* Signed yaml


Former-commit-id: e2665dd

* Fix makefile


Former-commit-id: 6bfcc9d

* Fix tag


Former-commit-id: 9ac2297

* Using drone tag


Former-commit-id: 475d8cd

* Fix drone tag


Former-commit-id: 4d7029e

* Fix drone issues


Former-commit-id: bbb95ba

* Fix docker not being available


Former-commit-id: 4387301

* Set build in container flag


Former-commit-id: 7ed76a9

* fix


Former-commit-id: 2623c6e

* fix


Former-commit-id: c27a8ff

* fix


Former-commit-id: 06d8e36

* remove dead code


Former-commit-id: b074c9e

* comments


Former-commit-id: eee8e0c

* sign


Former-commit-id: c29ec03

* comments


Former-commit-id: 5c320aa

* comments


Former-commit-id: acacde9

* comments


Former-commit-id: 8acfe15

* comments


Former-commit-id: 3a40480

* comments


Former-commit-id: d7e3103

* comments


Former-commit-id: 84303ac

* comments


Former-commit-id: 2c56ddc

* comments


Former-commit-id: 978dc72

* comments


Former-commit-id: 61a5cfb

* Update changelog


Former-commit-id: 2348bf7

* comments


Former-commit-id: 4ce65c6

* test build


Former-commit-id: fbf9ecc

* test build


Former-commit-id: 1a845d8

* test build


Former-commit-id: 57c0350

* test build


Former-commit-id: 75305d7

* test build


Former-commit-id: 76b79a4

* test build


Former-commit-id: 9517eae

* test build


Former-commit-id: 9f57b5d

* test build


Former-commit-id: 6c37355

* test build


Former-commit-id: 738b53b

* test build


Former-commit-id: d3a389e

* Cleanup


Former-commit-id: c44965e

* Remove release.key


Former-commit-id: 1f743bf

* Fix for windows installer build


Former-commit-id: b8221d5

* Allow windows installer builds


Former-commit-id: a977ecb

* Simplify makefile

* Remove unused files

* Add test back to github

* Fix normal makes

* Reorder changelog

* Fix arm64

* Arm fix

* Remove comment lines

* rename governance

* use seego

* Simplify seego usage

* include fix for test

* Fix for dout

* Only build docker container if needed

* Add depends on

* Fix naming

* Unsilent any remaining output

* unsilent

* Remove check-seego and switch to using docker by default

* Change triggers

* rename master to main

* Fix dependency order now that Dist only triggers on tags

* Sign drone

* mount local go mod cache to seego if one exists

* Clean up triggers

* Add trigger to dist

* testing change for synchronized

* testing change for synchronized

* Undo changeS

* sign drone

* Prevent double build

* remove extra check

* deduplicate build

* deduplicate build

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

* Logs:  create positionsdir per config (#757)

* create positions directory per instance

* update docs

* operator: add cluster label to all logs (#758)

* Merge changelog into main

Co-authored-by: Robert Fratto <robert.fratto@grafana.com>
Co-authored-by: Gabriel <g.amaral.antunes@gmail.com>
Co-authored-by: Mario <mariorvinas@gmail.com>
Co-authored-by: Ryan Geyer <me@ryangeyer.com>
Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
Co-authored-by: Koenraad Verheyden <koenraad.verheyden@posteo.net>
Co-authored-by: Justin Walz <justin.walz10@gmail.com>
Co-authored-by: Tharun Rajendran <rajendrantharun@live.com>
Co-authored-by: Alexander <kazakov.a.s.90@gmail.com>
Co-authored-by: Annanay Agarwal <annanay25@users.noreply.github.com>
Co-authored-by: Cristian Greco <cristian@regolo.cc>
Co-authored-by: hanif <hjet@users.noreply.github.com>
Co-authored-by: Robert Fratto <robertfratto@gmail.com>
rgeyer added a commit that referenced this pull request Jul 22, 2021
* Initialize biggest ref to existing ref when reading a segment (#676)

* initialize biggest ref to existing ref when reading a segment

* changelog

* allow new test to be less hard-coded

* explain error if test fails

* clarify changelog issue

* prepare for v0.16.1 release (#679)

* adding docker-compose example for local testing

(cherry picked from commit 992e3cf)

* Cherry picking kafka importer

* update Operator FAQ to describe custom scrape jobs (#658)

* Merge

* merge for race condition

* Wall cherry pick

* Import Kafka

* Bump version number to v0.17.0

* Add TLS config options for tempo remote_write (#666)

* Add TLS config options for tempo s

* cleanup

* Apply suggestions

* Rebase

* Update operator to use v0.16.1 by default (#681)

* update operator to use v0.16.1 by default

* changelog

* improve changelog phrasing?

* Add OTLP HTPP exporter support (#683)

* Tanka Jsonnet Integrations Fixes (#698)

* Hack the integrationsmixin to be always applied

* Remove hack which always applies integrations mixin. Fix copy/pasta

* Conditionally mutate agent daemonset or deployment when node_exporter integration is enabled

* document horizontal scaling (#696)

* document horizontal scaling

* clean up format of pros/cons

* Upgrade otel to v0.29.0 (#700)

* Upgrade otel to v0.29.0

Using grafana's fork which removes internal folders.

Signed-off-by: Mario Rodriguez <mariorvinas@gmail.com>

* Changelog

Signed-off-by: Mario Rodriguez <mariorvinas@gmail.com>

* Explain fork

* renamed guide and updated headings (#704)

* Docs: Getting started (#705)

* moved docs

* Update docs/getting-started/_index.md

Co-authored-by: Robert Fratto <robert.fratto@grafana.com>

Co-authored-by: Robert Fratto <robert.fratto@grafana.com>

* Docs: automatic logging is at the top level of instance config (#711)

See the actual config struct
https://github.com/grafana/agent/blob/50efa00ac3edeec52353549d4e786126cbd35370/pkg/tempo/config.go#L107-L137

* Docs: Configuration (#712)

* moved file

* added server-config.md

* added prometheus-config.md

* Create loki-config.md

* Update configuration-reference.md

* Create tempo-config.md

* added integrations-config

* updated links

* Update grafana-agent config regex replacement (#707)

This PR fixes an issue that users of config.expand-env face.

* moved and renamed files (#706)

* trigger reload configuration using SIGHUP (#710)

* trigger reload configuration using SIGHUP

* fix review changes - stop and close signal on defer

* add changelog for reloading config using SIGHUP

* add post method for config reload api (#709)

* move maintainers guide out of docs (#714)

move each to cmd/<project>/DEVELOPERS.md

* Add github action job to check if links in docs are correct (#708)

* Add debug log in prom-sd processor to indicate missing ip tag (#718)

Signed-off-by: Annanay <annanay.agarwal@grafana.com>

* Update dashboards setup in production mixin. (#685)

This changes the following:
- fix `Scrape failures` queries to use the proper variables like the
  rest of queries
- add `grafana-agent-mixin` tag to all dashboards to allow easy link
  and discovery

* fix race condition in initializing cluster (#690)

* Docs: More cleanup (#720)

* added metadata and renamed

* Update scraping-service.md

* Update operation-guide.md

* edits

* Update _index.md

* Update loki-config.md

* Update _index.md

* Update prometheus-config.md

* Create create-config-file.md

* Update _index.md

* Update architecture.md

* Update getting-started.md

* Update README.md

* Update README.md

* Update _index.md

* Operator: create CRDs for logging (#721)

* operator: create CRDs for logging

* fix lint nits

* Docs: Integrations (#723)

* content edits

* Create consul-exporter-config.md

* Create statsd-exporter-config.md

* Create postgres-exporter-config.md

* Create memcached-exporter-config.md

* Create elasticsearch-exporter-config.md

* Create dnsmasq-exporter-config.md

* Create redis-exporter-config.md

* Create mysqld-exporter-config.md

* Create process-exporter-config.md

* Create node-exporter-config.md

* Update _index.md

* Update api.md

* Update operation-guide.md

* Update operation-guide.md

* remove duplicated config blobs (#719)

* Remove duplicated blobs from Prometheus and link to Prometheus
* Move tls config entry to server-config where it belongs
* Use consistent strategy for linking to external documentation

* Docs: change operator custom scrape jobs example to use integrations job_name (#726)

* update operator custom scrape jobs example to use integrations-specific job_name

* add known issue

* add rollout command corresponding to getting started guide

* Set DNSPolicy correctly when host network is used in daemonset (#728)

* Rename "loki" to "logs" (#727)

* Embedding Kafka Lag Exporter (#674)

* Embedding the Kafka Lag Exporter

* update default config

* changelog and docs updated

* removing tabs from doc file

* removing tabs from doc file

* solving naming standards and identiation issues, adding defaults according to the documentation and checks for mandatory config flags

* Embedding the Kafka Lag Exporter

* update default config

* changelog merged

* removing tabs from doc file

* removing tabs from doc file

* solving naming standards and identiation issues, adding defaults according to the documentation and checks for mandatory config flags

* some other renames and identations

* fixing misspelling

* fixing field names and docs

* Remove trailing empty line

Co-authored-by: Robert Fratto <robert.fratto@grafana.com>

* adding docker-compose example for local testing

* Merge from main and reformat config

Co-authored-by: Robert Fratto <robert.fratto@grafana.com>
Co-authored-by: Matt Durham <mattdurham@ppog.org>

* Support autologging span attributes as loki labels (#703)

* Support autologging span attributes as log labels

* Update test

* Fix test

* apply suggestions

Signed-off-by: Mario Rodriguez <mariorvinas@gmail.com>

* Faster stringify

* Support no keyvalues

* Correctly size map

* Fix config

* Skip STATUS_CODE_UNSET to be less spammy

* Fix tests

* Use struct map

* Fix rebase

* Improve docs

* Apply suggestions

* yeah, don't change that

* Grafana Agent Operator: generate logs config (#740)

* wip generate logging config

* generate log client

* generate config for pipelines

* generate pod logs

* fix lint error

* buckets precision warning

* crds: denote required fields, fix typos

* buffer notifier channel (#744)

* Clean up K8s deployment methods (#749)

* Cleans up some deployment methods:

- Updates README directing users to Graf Cloud docs for full instructions
- Removes generation of `agent.yaml` and `agent-sigv4.yaml` from build script
- Removes generated `agent.yaml` and `agent-sigv4.yaml`
- Updates logs Tanka to remove ConfigMap (moved to Graf Cloud docs)
- Removes install scripts

* Update production/README.md

* Add link

* Update links

* Fix broken links and update doc

* Add line to direct users to quickstart guides

* Add install-bare.sh warning (#752)

* add install-bare.sh warning

* use emoji to make warning more warning-er

* Ignore regex capture groups when expanding environment vars (#754)

* ignore regex capture groups when expanding environment vars

* document behavior of regex capture group coercion

* remove weird formatting in changelog

* Implement Drone Build system, moving away from release via Github Actions (#732)

* Initial drone support

* Fix drone file

* Drone changes

* Added support for drone building

* Echo from makefile

* Add logging info

* Add logging info

* Add logging info

* Add debugging info

* Add make debugging info

* Add seego debugging

* add ls to see why files arent getting copied

* More debugging

* simplify

* Drone changes

* Drone v2

Former-commit-id: 914b4a3

* Remove invalid files

Former-commit-id: 7426669

* Fix freebsd build

Former-commit-id: 8f1fc64

* Setting up tokens

Former-commit-id: 246be58

* Removing windows build output

Former-commit-id: 241d9bb

* Fix for docker builds

Former-commit-id: 3babea6

* Remove containerize no docker

Former-commit-id: 90660b5

* Make buildx single threaded

Former-commit-id: e1fa585

* Building against personal docker account

Former-commit-id: 83bb1cc

* Merge changes

Former-commit-id: f6b8df9

* Remove exe

Former-commit-id: 79ce552

* Removed V6 temporarily to see if fixed

Former-commit-id: e6c5680

* Removed extra steps

Former-commit-id: cb89f55

* Signed yaml

Former-commit-id: e2665dd

* Fix makefile

Former-commit-id: 6bfcc9d

* Fix tag

Former-commit-id: 9ac2297

* Using drone tag

Former-commit-id: 475d8cd

* Fix drone tag

Former-commit-id: 4d7029e

* Fix drone issues

Former-commit-id: bbb95ba

* Fix docker not being available

Former-commit-id: 4387301

* Set build in container flag

Former-commit-id: 7ed76a9

* fix

Former-commit-id: 2623c6e

* fix

Former-commit-id: c27a8ff

* fix

Former-commit-id: 06d8e36

* remove dead code

Former-commit-id: b074c9e

* comments

Former-commit-id: eee8e0c

* sign

Former-commit-id: c29ec03

* comments

Former-commit-id: 5c320aa

* comments

Former-commit-id: acacde9

* comments

Former-commit-id: 8acfe15

* comments

Former-commit-id: 3a40480

* comments

Former-commit-id: d7e3103

* comments

Former-commit-id: 84303ac

* comments

Former-commit-id: 2c56ddc

* comments

Former-commit-id: 978dc72

* comments

Former-commit-id: 61a5cfb

* Update changelog

Former-commit-id: 2348bf7

* comments

Former-commit-id: 4ce65c6

* test build

Former-commit-id: fbf9ecc

* test build

Former-commit-id: 1a845d8

* test build

Former-commit-id: 57c0350

* test build

Former-commit-id: 75305d7

* test build

Former-commit-id: 76b79a4

* test build

Former-commit-id: 9517eae

* test build

Former-commit-id: 9f57b5d

* test build

Former-commit-id: 6c37355

* test build

Former-commit-id: 738b53b

* test build

Former-commit-id: d3a389e

* Cleanup

Former-commit-id: c44965e

* Remove release.key

Former-commit-id: 1f743bf

* Fix for windows installer build

Former-commit-id: b8221d5

* Allow windows installer builds

Former-commit-id: a977ecb

* Simplify makefile

* Remove unused files

* Add test back to github

* Fix normal makes

* Reorder changelog

* Fix arm64

* Arm fix

* Remove comment lines

* rename governance

* use seego

* Simplify seego usage

* include fix for test

* Fix for dout

* Only build docker container if needed

* Add depends on

* Fix naming

* Unsilent any remaining output

* unsilent

* Remove check-seego and switch to using docker by default

* Change triggers

* rename master to main

* Fix dependency order now that Dist only triggers on tags

* Sign drone

* mount local go mod cache to seego if one exists

* Clean up triggers

* Add trigger to dist

* testing change for synchronized

* testing change for synchronized

* Undo changeS

* sign drone

* Prevent double build

* remove extra check

* deduplicate build

* deduplicate build

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

* Logs:  create positionsdir per config (#757)

* create positions directory per instance

* update docs

* operator: add cluster label to all logs (#758)

* Merge changelog into main

Co-authored-by: Robert Fratto <robert.fratto@grafana.com>
Co-authored-by: Gabriel <g.amaral.antunes@gmail.com>
Co-authored-by: Mario <mariorvinas@gmail.com>
Co-authored-by: Ryan Geyer <me@ryangeyer.com>
Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
Co-authored-by: Koenraad Verheyden <koenraad.verheyden@posteo.net>
Co-authored-by: Justin Walz <justin.walz10@gmail.com>
Co-authored-by: Tharun Rajendran <rajendrantharun@live.com>
Co-authored-by: Alexander <kazakov.a.s.90@gmail.com>
Co-authored-by: Annanay Agarwal <annanay25@users.noreply.github.com>
Co-authored-by: Cristian Greco <cristian@regolo.cc>
Co-authored-by: hanif <hjet@users.noreply.github.com>
Co-authored-by: Robert Fratto <robertfratto@gmail.com>
flokli added a commit to scarf-sh/terraform-kubernetes-grafana-agent that referenced this pull request Jul 23, 2021
grafana-cold-storage/agent#749 removed
production/kubernetes/agent.yaml, and switched to
production/kubernetes/agent-bare.yaml, which describes a single
Deployment, instead of the previous Deployment and DaemonSet.

The individual kube-state-metrics and node-exporter scrape_configs are
gone - so we don't need these variables anymore.

The repo doesn't contain the ConfigMap contents anymore - these moved to
https://grafana.com/docs/grafana-cloud/quickstart/agent-k8s/k8s_agent_metrics.

Contrary to the `external_labels` `cluster` label added there, we keep
our more powerful `external_labels` map, which of course can contain a
"cluster" key.
flokli added a commit to scarf-sh/terraform-kubernetes-grafana-agent that referenced this pull request Jul 23, 2021
grafana-cold-storage/agent#749 removed
production/kubernetes/agent.yaml, and switched to
production/kubernetes/agent-bare.yaml, which describes a single
Deployment, instead of the previous Deployment and DaemonSet.

The individual kube-state-metrics and node-exporter scrape_configs are
gone - so we don't need to interpolate them in the config anymore.

We still need to ask for the namespace for node-exporter, as this module
still deploys node-exporter.

The repo doesn't contain the ConfigMap contents anymore - these moved to
https://grafana.com/docs/grafana-cloud/quickstart/agent-k8s/k8s_agent_metrics.

Contrary to the `external_labels` `cluster` label added there, we keep
our more powerful `external_labels` map, which of course can contain a
"cluster" key.
flokli added a commit to scarf-sh/terraform-kubernetes-grafana-agent that referenced this pull request Jul 23, 2021
grafana-cold-storage/agent#749 removed
production/kubernetes/agent.yaml, and switched to
production/kubernetes/agent-bare.yaml, which describes a single
Deployment, instead of the previous Deployment and DaemonSet.

The individual kube-state-metrics and node-exporter scrape_configs are
gone - so we don't need to interpolate them in the config anymore.

We still need to ask for the namespace for node-exporter, as this module
still deploys node-exporter.

The repo doesn't contain the ConfigMap contents anymore - these moved to
https://grafana.com/docs/grafana-cloud/quickstart/agent-k8s/k8s_agent_metrics.

Contrary to the `external_labels` `cluster` label added there, we keep
our more powerful `external_labels` map, which of course can contain a
"cluster" key.
@flokli

flokli commented Jul 23, 2021

Copy link
Copy Markdown
Contributor

I noticed this stops deploying node-exporter, and having custom scrape configs from node-exporter and kube-state-metrics.

The Grafana Agent Metrics Kubernetes Quickstart doesn't seem to include a mention about this - as well as the requirement of a port named -metrics. At least for the latter, we had that remark in https://github.com/grafana/agent/pull/749/files#diff-4369de20767a72f00e221e1f2c5dab1f1b282af26d355ab3ce8289a840c64a26L64 - and should probably take it over to the website.

@hjet

hjet commented Jul 23, 2021

Copy link
Copy Markdown
Contributor Author

Hey @flokli, thanks for your message and interest in the Grafana Agent!

I noticed this stops deploying node-exporter, and having custom scrape configs from node-exporter and kube-state-metrics.

Yeah, that agent.yaml (with node-exporter, kube-state-metrics, etc.) manifest was confusing users more than it was helping them so we've decided to temporarily keep things simple with 3 "getting started" manifests:

  • agent-bare.yaml for metrics (deployment)
  • agent-loki.yaml for logs (daemonset)
  • agent-tempo.yaml for traces (deployment)

With quickstarts available here.

Running the Agent as a DaemonSet for scraping metrics (and using the Agent node-exporter integration) is still possible, however the configuration and setup is a little more involved, so we've chosen to adopt a simpler approach for "quickstart" purposes. You can learn more about that architecture in this community forums post.

As @rfratto noted, we are focussing on the Agent Operator (note only supports metrics at the moment) and Helm charts, as well as first-class integrations support, which will streamline and simplify deploying Agent (and node-exporter) into your clusters. We are also working on improvements to the Agent's clustering and scraping service, which will also help with this.

as well as the requirement of a port named -metrics.

The new scrape config in the quickstart doesn't have this clause:

- action: keep
  regex: .*-metrics
  source_labels:
    - __meta_kubernetes_pod_container_port_name

So there is no requirement for a -metrics port name anymore. The default config only scrapes the /metrics/cadvisor and /metrics endpoints on all of your cluster Nodes.

@flokli

flokli commented Jul 30, 2021

Copy link
Copy Markdown
Contributor

I realized the agent-bare.yaml doesn't scrape pods at all anymore - so yes, the -metrics requirement is gone as well as with that whole scraping. I guess the recommended way to bring this back is to run other instances of grafana-agent, with (some) pod scraping config, to get those values back?

@hjet

hjet commented Aug 3, 2021

Copy link
Copy Markdown
Contributor Author

This guide shows you how to bring up an Agent Deployment to scrape metrics in your cluster.

The default config does not configure the Agent to scrape Pod metrics. A sample config stanza to scrape Pod metrics can be found in the old manifest.

For convenience I am pasting the relevant section here:

- job_name: kubernetes-pods
  kubernetes_sd_configs:
    - role: pod
  relabel_configs:
    - action: drop
      regex: "false"
      source_labels:
        - __meta_kubernetes_pod_annotation_prometheus_io_scrape
    - action: keep
      regex: .*-metrics
      source_labels:
        - __meta_kubernetes_pod_container_port_name
    - action: replace
      regex: (https?)
      replacement: $1
      source_labels:
        - __meta_kubernetes_pod_annotation_prometheus_io_scheme
      target_label: __scheme__
    - action: replace
      regex: (.+)
      replacement: $1
      source_labels:
        - __meta_kubernetes_pod_annotation_prometheus_io_path
      target_label: __metrics_path__
    - action: replace
      regex: (.+?)(\:\d+)?;(\d+)
      replacement: $1:$3
      source_labels:
        - __address__
        - __meta_kubernetes_pod_annotation_prometheus_io_port
      target_label: __address__
    - action: drop
      regex: ""
      source_labels:
        - __meta_kubernetes_pod_label_name
    - action: replace
      replacement: $1
      separator: /
      source_labels:
        - __meta_kubernetes_namespace
        - __meta_kubernetes_pod_label_name
      target_label: job
    - action: replace
      source_labels:
        - __meta_kubernetes_namespace
      target_label: namespace
    - action: replace
      source_labels:
        - __meta_kubernetes_pod_name
      target_label: pod
    - action: replace
      source_labels:
        - __meta_kubernetes_pod_container_name
      target_label: container
    - action: replace
      separator: ':'
      source_labels:
        - __meta_kubernetes_pod_name
        - __meta_kubernetes_pod_container_name
        - __meta_kubernetes_pod_container_port_name
      target_label: instance
    - action: labelmap
      regex: __meta_kubernetes_pod_annotation_prometheus_io_param_(.+)
      replacement: __param_$1
    - action: drop
      regex: Succeeded|Failed
      source_labels:
        - __meta_kubernetes_pod_phase

Note that you may need to modify this depending on your use case. If you are using this block, note that the old requirements also apply:

  • The pod must not have an annotation matching prometheus.io/scrape: "false" (this wouldn't be there unless you explicitly add it or if you deploy a Helm chart that has it).
  • The pod must have a port with a name ending in -metrics. This is the port that will be scraped by the Agent. A lot of people using Helm struggle with this, since Helm charts don't usually follow this. You would need to add a new scrape config to scrape helm charts or find a way to tweak the Helm chart to follow this rules.
  • The pod must have a label named name with any non-empty value. Helm usually lets you add extra labels, so this is less of a problem for Helm users.
  • The pod must currently be running. (i.e., Kubernetes must not report it having a phase of Succeeded or Failed).

TLDR you can use the same manifest / Deployment, just add the above config block to the Agent's ConfigMap to configure it to scrape Pod metrics.

@flokli

flokli commented Aug 3, 2021

Copy link
Copy Markdown
Contributor

Thanks! Yeah, I realized these were gone when switching from agent.yaml to agent-bare.yaml.

Instead of resurrecting them and writing a lot of scraping rules by myself, I went ahead deploying your operator, and have it generate that yaml for me :-)

@mattdurham mattdurham mentioned this pull request Sep 7, 2021
3 tasks
mattdurham pushed a commit that referenced this pull request Nov 11, 2021
* Cleans up some deployment methods:

- Updates README directing users to Graf Cloud docs for full instructions
- Removes generation of `agent.yaml` and `agent-sigv4.yaml` from build script
- Removes generated `agent.yaml` and `agent-sigv4.yaml`
- Updates logs Tanka to remove ConfigMap (moved to Graf Cloud docs)
- Removes install scripts

* Update production/README.md

* Add link

* Update links

* Fix broken links and update doc

* Add line to direct users to quickstart guides
mattdurham added a commit that referenced this pull request Nov 11, 2021
* Initialize biggest ref to existing ref when reading a segment (#676)

* initialize biggest ref to existing ref when reading a segment

* changelog

* allow new test to be less hard-coded

* explain error if test fails

* clarify changelog issue

* prepare for v0.16.1 release (#679)

* adding docker-compose example for local testing

(cherry picked from commit 992e3cf)

* Cherry picking kafka importer

* update Operator FAQ to describe custom scrape jobs (#658)

* Merge

* merge for race condition

* Wall cherry pick

* Import Kafka

* Bump version number to v0.17.0

* Add TLS config options for tempo remote_write (#666)

* Add TLS config options for tempo s

* cleanup

* Apply suggestions

* Rebase

* Update operator to use v0.16.1 by default (#681)

* update operator to use v0.16.1 by default

* changelog

* improve changelog phrasing?

* Add OTLP HTPP exporter support (#683)

* Tanka Jsonnet Integrations Fixes (#698)

* Hack the integrationsmixin to be always applied

* Remove hack which always applies integrations mixin. Fix copy/pasta

* Conditionally mutate agent daemonset or deployment when node_exporter integration is enabled

* document horizontal scaling (#696)

* document horizontal scaling

* clean up format of pros/cons

* Upgrade otel to v0.29.0 (#700)

* Upgrade otel to v0.29.0

Using grafana's fork which removes internal folders.

Signed-off-by: Mario Rodriguez <mariorvinas@gmail.com>

* Changelog

Signed-off-by: Mario Rodriguez <mariorvinas@gmail.com>

* Explain fork

* renamed guide and updated headings (#704)

* Docs: Getting started (#705)

* moved docs

* Update docs/getting-started/_index.md

Co-authored-by: Robert Fratto <robert.fratto@grafana.com>

Co-authored-by: Robert Fratto <robert.fratto@grafana.com>

* Docs: automatic logging is at the top level of instance config (#711)

See the actual config struct
https://github.com/grafana/agent/blob/50efa00ac3edeec52353549d4e786126cbd35370/pkg/tempo/config.go#L107-L137

* Docs: Configuration (#712)

* moved file

* added server-config.md

* added prometheus-config.md

* Create loki-config.md

* Update configuration-reference.md

* Create tempo-config.md

* added integrations-config

* updated links

* Update grafana-agent config regex replacement (#707)

This PR fixes an issue that users of config.expand-env face.

* moved and renamed files (#706)

* trigger reload configuration using SIGHUP (#710)

* trigger reload configuration using SIGHUP

* fix review changes - stop and close signal on defer

* add changelog for reloading config using SIGHUP

* add post method for config reload api (#709)

* move maintainers guide out of docs (#714)

move each to cmd/<project>/DEVELOPERS.md

* Add github action job to check if links in docs are correct (#708)

* Add debug log in prom-sd processor to indicate missing ip tag (#718)

Signed-off-by: Annanay <annanay.agarwal@grafana.com>

* Update dashboards setup in production mixin. (#685)

This changes the following:
- fix `Scrape failures` queries to use the proper variables like the
  rest of queries
- add `grafana-agent-mixin` tag to all dashboards to allow easy link
  and discovery

* fix race condition in initializing cluster (#690)

* Docs: More cleanup (#720)

* added metadata and renamed

* Update scraping-service.md

* Update operation-guide.md

* edits

* Update _index.md

* Update loki-config.md

* Update _index.md

* Update prometheus-config.md

* Create create-config-file.md

* Update _index.md

* Update architecture.md

* Update getting-started.md

* Update README.md

* Update README.md

* Update _index.md

* Operator: create CRDs for logging (#721)

* operator: create CRDs for logging

* fix lint nits

* Docs: Integrations (#723)

* content edits

* Create consul-exporter-config.md

* Create statsd-exporter-config.md

* Create postgres-exporter-config.md

* Create memcached-exporter-config.md

* Create elasticsearch-exporter-config.md

* Create dnsmasq-exporter-config.md

* Create redis-exporter-config.md

* Create mysqld-exporter-config.md

* Create process-exporter-config.md

* Create node-exporter-config.md

* Update _index.md

* Update api.md

* Update operation-guide.md

* Update operation-guide.md

* remove duplicated config blobs (#719)

* Remove duplicated blobs from Prometheus and link to Prometheus
* Move tls config entry to server-config where it belongs
* Use consistent strategy for linking to external documentation

* Docs: change operator custom scrape jobs example to use integrations job_name (#726)

* update operator custom scrape jobs example to use integrations-specific job_name

* add known issue

* add rollout command corresponding to getting started guide

* Set DNSPolicy correctly when host network is used in daemonset (#728)

* Rename "loki" to "logs" (#727)

* Embedding Kafka Lag Exporter (#674)

* Embedding the Kafka Lag Exporter

* update default config

* changelog and docs updated

* removing tabs from doc file

* removing tabs from doc file

* solving naming standards and identiation issues, adding defaults according to the documentation and checks for mandatory config flags

* Embedding the Kafka Lag Exporter

* update default config

* changelog merged

* removing tabs from doc file

* removing tabs from doc file

* solving naming standards and identiation issues, adding defaults according to the documentation and checks for mandatory config flags

* some other renames and identations

* fixing misspelling

* fixing field names and docs

* Remove trailing empty line

Co-authored-by: Robert Fratto <robert.fratto@grafana.com>

* adding docker-compose example for local testing

* Merge from main and reformat config

Co-authored-by: Robert Fratto <robert.fratto@grafana.com>
Co-authored-by: Matt Durham <mattdurham@ppog.org>

* Support autologging span attributes as loki labels (#703)

* Support autologging span attributes as log labels

* Update test

* Fix test

* apply suggestions

Signed-off-by: Mario Rodriguez <mariorvinas@gmail.com>

* Faster stringify

* Support no keyvalues

* Correctly size map

* Fix config

* Skip STATUS_CODE_UNSET to be less spammy

* Fix tests

* Use struct map

* Fix rebase

* Improve docs

* Apply suggestions

* yeah, don't change that

* Grafana Agent Operator: generate logs config (#740)

* wip generate logging config

* generate log client

* generate config for pipelines

* generate pod logs

* fix lint error

* buckets precision warning

* crds: denote required fields, fix typos

* buffer notifier channel (#744)

* Clean up K8s deployment methods (#749)

* Cleans up some deployment methods:

- Updates README directing users to Graf Cloud docs for full instructions
- Removes generation of `agent.yaml` and `agent-sigv4.yaml` from build script
- Removes generated `agent.yaml` and `agent-sigv4.yaml`
- Updates logs Tanka to remove ConfigMap (moved to Graf Cloud docs)
- Removes install scripts

* Update production/README.md

* Add link

* Update links

* Fix broken links and update doc

* Add line to direct users to quickstart guides

* Add install-bare.sh warning (#752)

* add install-bare.sh warning

* use emoji to make warning more warning-er

* Ignore regex capture groups when expanding environment vars (#754)

* ignore regex capture groups when expanding environment vars

* document behavior of regex capture group coercion

* remove weird formatting in changelog

* Implement Drone Build system, moving away from release via Github Actions (#732)

* Initial drone support

* Fix drone file

* Drone changes

* Added support for drone building

* Echo from makefile

* Add logging info

* Add logging info

* Add logging info

* Add debugging info

* Add make debugging info

* Add seego debugging

* add ls to see why files arent getting copied

* More debugging

* simplify

* Drone changes

* Drone v2


Former-commit-id: 914b4a3

* Remove invalid files


Former-commit-id: 7426669

* Fix freebsd build


Former-commit-id: 8f1fc64

* Setting up tokens


Former-commit-id: 246be58

* Removing windows build output


Former-commit-id: 241d9bb

* Fix for docker builds


Former-commit-id: 3babea6

* Remove containerize no docker


Former-commit-id: 90660b5

* Make buildx single threaded


Former-commit-id: e1fa585

* Building against personal docker account


Former-commit-id: 83bb1cc

* Merge changes


Former-commit-id: f6b8df9

* Remove exe


Former-commit-id: 79ce552

* Removed V6 temporarily to see if fixed


Former-commit-id: e6c5680

* Removed extra steps


Former-commit-id: cb89f55

* Signed yaml


Former-commit-id: e2665dd

* Fix makefile


Former-commit-id: 6bfcc9d

* Fix tag


Former-commit-id: 9ac2297

* Using drone tag


Former-commit-id: 475d8cd

* Fix drone tag


Former-commit-id: 4d7029e

* Fix drone issues


Former-commit-id: bbb95ba

* Fix docker not being available


Former-commit-id: 4387301

* Set build in container flag


Former-commit-id: 7ed76a9

* fix


Former-commit-id: 2623c6e

* fix


Former-commit-id: c27a8ff

* fix


Former-commit-id: 06d8e36

* remove dead code


Former-commit-id: b074c9e

* comments


Former-commit-id: eee8e0c

* sign


Former-commit-id: c29ec03

* comments


Former-commit-id: 5c320aa

* comments


Former-commit-id: acacde9

* comments


Former-commit-id: 8acfe15

* comments


Former-commit-id: 3a40480

* comments


Former-commit-id: d7e3103

* comments


Former-commit-id: 84303ac

* comments


Former-commit-id: 2c56ddc

* comments


Former-commit-id: 978dc72

* comments


Former-commit-id: 61a5cfb

* Update changelog


Former-commit-id: 2348bf7

* comments


Former-commit-id: 4ce65c6

* test build


Former-commit-id: fbf9ecc

* test build


Former-commit-id: 1a845d8

* test build


Former-commit-id: 57c0350

* test build


Former-commit-id: 75305d7

* test build


Former-commit-id: 76b79a4

* test build


Former-commit-id: 9517eae

* test build


Former-commit-id: 9f57b5d

* test build


Former-commit-id: 6c37355

* test build


Former-commit-id: 738b53b

* test build


Former-commit-id: d3a389e

* Cleanup


Former-commit-id: c44965e

* Remove release.key


Former-commit-id: 1f743bf

* Fix for windows installer build


Former-commit-id: b8221d5

* Allow windows installer builds


Former-commit-id: a977ecb

* Simplify makefile

* Remove unused files

* Add test back to github

* Fix normal makes

* Reorder changelog

* Fix arm64

* Arm fix

* Remove comment lines

* rename governance

* use seego

* Simplify seego usage

* include fix for test

* Fix for dout

* Only build docker container if needed

* Add depends on

* Fix naming

* Unsilent any remaining output

* unsilent

* Remove check-seego and switch to using docker by default

* Change triggers

* rename master to main

* Fix dependency order now that Dist only triggers on tags

* Sign drone

* mount local go mod cache to seego if one exists

* Clean up triggers

* Add trigger to dist

* testing change for synchronized

* testing change for synchronized

* Undo changeS

* sign drone

* Prevent double build

* remove extra check

* deduplicate build

* deduplicate build

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

* Logs:  create positionsdir per config (#757)

* create positions directory per instance

* update docs

* operator: add cluster label to all logs (#758)

* Merge changelog into main

Co-authored-by: Robert Fratto <robert.fratto@grafana.com>
Co-authored-by: Gabriel <g.amaral.antunes@gmail.com>
Co-authored-by: Mario <mariorvinas@gmail.com>
Co-authored-by: Ryan Geyer <me@ryangeyer.com>
Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
Co-authored-by: Koenraad Verheyden <koenraad.verheyden@posteo.net>
Co-authored-by: Justin Walz <justin.walz10@gmail.com>
Co-authored-by: Tharun Rajendran <rajendrantharun@live.com>
Co-authored-by: Alexander <kazakov.a.s.90@gmail.com>
Co-authored-by: Annanay Agarwal <annanay25@users.noreply.github.com>
Co-authored-by: Cristian Greco <cristian@regolo.cc>
Co-authored-by: hanif <hjet@users.noreply.github.com>
Co-authored-by: Robert Fratto <robertfratto@gmail.com>
@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 Apr 11, 2024
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Apr 11, 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.

4 participants