Sync with Grafana Agent Kubernetes Quickstart - #12
Closed
flokli wants to merge 5 commits into
Closed
Conversation
flokli
force-pushed
the
grafana-agent-bare
branch
from
July 23, 2021 14:35
6633310 to
da32f37
Compare
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
force-pushed
the
grafana-agent-bare
branch
from
July 23, 2021 14:44
da32f37 to
c157519
Compare
Contributor
Author
|
I don't think using |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
grafana-cold-storage/agent#749 removed
production/kubernetes/agent.yaml, and switched toproduction/kubernetes/agent-bare.yaml, which describes a singleDeployment, instead of the previousDeploymentandDaemonSet.The individual
kube-state-metricsandnode-exporterscrape_configsaregone - so we don't need these variables anymore.
The repo doesn't contain the
ConfigMapcontents anymore - these moved tohttps://grafana.com/docs/grafana-cloud/quickstart/agent-k8s/k8s_agent_metrics.
Contrary to the
external_labelsclusterlabel added there, we keepour more powerful
external_labelsmap, which of course can contain a"cluster" key.
In addiiton to this, some file renames, and a move of the
basic_authdatainto the new block - like the Grafana Agent Logs Kubernetes Quickstart suggests.
Fixes #11.