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

Merge main into dev.frontend-receiver #1362

Merged

Conversation

rfratto
Copy link
Member

@rfratto rfratto commented Feb 5, 2022

dev.frontend-receiver was missing the CI changes to main (#1264) which prevent it from updating the latest image tag.

rfratto and others added 30 commits January 11, 2022 20:07
…rafana#1252)

* operator: fix bug where /-/ready and /-/healthy always returned 404

controller-runtime must have at least one ready/healthy check for the endpoints to exist

* fix lint error, use healthz.Ping
Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com>
…rafana#1264)

* Use RELEASE_TAG to choose between `:main` and `:latest` docker tags

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

* Use :main tag for images in smoke test

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

* Set IMAGE_BRANCH_TAG env var in drone and actions pipelines

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

* Remove quotes from Makefile variable

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

* Remove force_release action

Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com>
* prepare for v0.22.0 release

* remove E2E pipeline
* remove dedicated go.mod for e2e/

* move e2e/k8s to pkg/util/k8s

* Migrate operator tests to pkg/util/k8s

* remove dedicated e2e tests

* allow skipping TestCluster in pkg/util/k8s

* remove e2e/

* fix bad merge

* fix order of make env args for windows

* actually declare referenced docker volume

* introduce pkg/util/subset for asserting subset of objects

* refactor operator so it's testable

* define basic integration test for operator

* fix lint errors

* fix invalid address in operator test config
Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com>
* Upgrade to 1.17.6 in go.mod and Dockerfiles

* Update CHANGELOG.md to mention the update

* Update Go version in drone/actions pipelines

* Update go.mod, go.sum files via

* Re-sign drone.yml

* Remove leading newline causing drone build to fail

* Bump golangci-lint image to a version using Go 1.17

* Re-attempt to solve linter issue with new golangci-lint image

* Remove suffix of exclude rules

* Clean previous Go version before unpacking Go 1.17

* Also clean up previous Go versions in other steps
Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com>
* pkg/operator: refactor resource hierarchy discovery

This commit moves common logic related to discovering the resource
hierarchy to pkg/operator/hierarchy. This new package requires less
boilerplate, which the reconciler is updated to take advantage of.

* remove unused code

* test construction of resource hierarchy

* add missing build constraints

* small extra cleanup to use pointer package

* review feedback
(also use a consistent base image tag instead of latest)
* Skip non-ready instances in LoadInstances()

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

* Add changelog entry

Co-authored-by: Robert Fratto <robertfratto@gmail.com>
* Fix panic in prom_sd_processor when address is empty

* Fix panic in prom_sd_processor when address is empty

* Fix docs

* Add test case

* Lint

* Move to unreleased
* operator: generate proxy_url for remote_write

* fix weird indentation in test
* Use log format in traces subsystem

* Changelog

* Undo unwanted change

* Fix changelog entry
…egration (grafana#1312)

* integrations-next: Add extra_labels to inject extra labels for an integration.

* separate tests
Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com>
* Bypass Prometheus password redaction

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

* Add inline secret in existing test

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

* Add changelog entry

* Add to scrubbed testcase as well

Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com>
* Add memExemplar in stripeSeries as first iteration

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

* Add test for skipped duplicate exemplars; Simplify conditional

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

* Add changelog entry; discard test errors

* Move changelog entry

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

* Add Benchmark for AppendExemplar

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

* Discard error on added benchmark

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

* Use original exemplar struct instead of custom memExemplar

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

* Surround benchmark loop with start/stop timers and close test storage

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

* Add comment about prepopulating exemplars on WAL startup

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

* Wire in the totalAppendedExemplars metric

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

* Make comment more discoverable

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

* Make sure we're recording exemplars for non-nil series ref only

Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com>
…rafana#1318)

* integrations-next: wait for integrations to exit after stopping them

* fix lint errors

* minor refactor

* integrations-next: stop holding config mutex for entire reload

* make controller.run authoritative over running integrations

* fix log line

* move running integrations into a dedicated worker pool
…ConfigMaps (grafana#1340)

The initial implementation of hierarchy.KeySelector injected a
FieldSelector when listing Secrets and ConfigMaps to immediately return
the single object being queried for.

This causes a problem with the client generated by the
controller-runtime framework, where the client is wrapped in a cache and
field indexer (where only the namespace is indexed by default).

This commit avoids using the field selector and the index lookup. The
resulting behavior aligns more closely with discovering other resources
in the hierarchy (i.e., ServiceMonitors), where the List call is also
insufficient and needs post-processing via Matches to find the final
list of resources.

Given the controller-runtime client uses an informer for reads, all
relevant Secrets and ConfigMaps are already in-memory anyway, and using
the index for a faster List is a bit of an over-optimization at the
moment.
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
* Agent smoke test (grafana#1291)

* convert smoke script to go program

* update build for agent-smoke

* fix pr comments

* use existing log helper package

* refactor context cancel

* update exit codes

* use ticker

* prefer oklog/run instead of errgroup

* use nop logger

* refactor task interface

* remove functional options

* log.With for task loggers

* move smoke to tools

* build smoke image, push to internal registry

* move crow to tools

* add gcr_admin secret

* fix link to crow

* add smoke libsonnet and use in local k3d smoke test

* add deletePodBySelectorTask

* scale smoke-test replica down after local test

* refactor smoke Options to Config

* update duration usage message

* add some basic unit tests

* newlines

* pass mutation frequency and chaos frequency from smoke script

* pull crow image from gcr

* update smoke script

* move monitoring to smoke libsonnet

* move additional smoke resources needed in deployment tools

* reference libsonnet files from grafana-agent dep

* make drone

* fix images in smoke script

* get rid of extVars

* update k3d example environment to reference etcd from new location

* update smoke docker builds to use go1.17

* use pointer.Int64

* refactor smoke jsonnet (grafana#1296)

* add policy rule for list and delete pods (grafana#1319)

* refactor smoke.new function to take config object (grafana#1327)

* Apply suggestions from code review

* Update production/tanka/grafana-agent/smoke/crow/main.libsonnet

* Update production/tanka/grafana-agent/smoke/main.libsonnet

* Update example/k3d/scripts/smoke-test.bash

Co-authored-by: Robert Lankford <robert.lankford@grafana.com>

* readme update (grafana#1338)

Co-authored-by: Robert Fratto <robert.fratto@grafana.com>
Co-authored-by: Robert Fratto <robert.fratto@grafana.com>
* Add a stale check GH action to run every 24 hours

* remove old stale.yml file

* add permissions to action

* update the stale message to clarify when the stale label will get
removed

* Update .github/workflows/stale.yml
rfratto and others added 8 commits February 2, 2022 18:38
* Add K8s eventhandler integration (grafana#1310)
* Add docs and sample manifests to eventhandler integration (grafana#1328)
* Wait for cache to flush before returning
* Clarify eventhandler docs (grafana#1334)
* Clarify docs
* Update CHANGELOG.md
* Review changes (grafana#1349)
Signed-off-by: Robbie Lankford <robert.lankford@grafana.com>
…ana#1357)

* Configure cluster label using logs client external_labels param
* Update CHANGELOG.md
* add password file and basic auth round tripper in crow

* add ca-certificates in crow image

* add orgID flag

* update help text
@rfratto rfratto merged commit 9c22907 into grafana:dev.frontend-receiver Feb 5, 2022
@rfratto rfratto deleted the dev.frontend-receiver-merge-main branch March 14, 2022 18:17
flokli added a commit to NixOS/nixpkgs that referenced this pull request Apr 21, 2022
We can skip our little patch. The file was removed in
grafana/agent#1362, which includes
grafana/agent#1268.

The condition to exempt network tests was inverted as part of these PRs,
so we now need to set GOFLAGS explicitly to exclude tests that can't run
inside the Nix sandbox.
zimbatm pushed a commit to NixOS/nixpkgs that referenced this pull request Apr 21, 2022
We can skip our little patch. The file was removed in
grafana/agent#1362, which includes
grafana/agent#1268.

The condition to exempt network tests was inverted as part of these PRs,
so we now need to set GOFLAGS explicitly to exclude tests that can't run
inside the Nix sandbox.
@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 2, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 2, 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.

None yet