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

udpate import order in agentctl main.go - #1584

Merged
rlankfo merged 1 commit into
grafana-cold-storage:mainfrom
rlankfo:agentctl-version
Apr 8, 2022
Merged

rlankfo merged 1 commit into
grafana-cold-storage:mainfrom
rlankfo:agentctl-version

Conversation

@rlankfo

@rlankfo rlankfo commented Apr 8, 2022

Copy link
Copy Markdown
Contributor

PR Description

This updates the import order to move our version info import so version info doesn't get overridden by loki build package.

Which issue(s) this PR fixes

Notes to the Reviewer

Fixes failures we were seeing in homebrew/homebrew-core workflow when upgrading agent formula to v0.24.0:
Homebrew/homebrew-core#98774

PR Checklist

  • CHANGELOG updated
  • Documentation added
  • Tests updated

@rlankfo
rlankfo requested a review from rfratto April 8, 2022 21:15
@rlankfo
rlankfo merged commit 78aa623 into grafana-cold-storage:main Apr 8, 2022
rfratto added a commit to rfratto/agent that referenced this pull request Apr 11, 2022
Also add a retroactive changelog entry for grafana-cold-storage#1584
rfratto added a commit to rfratto/agent that referenced this pull request Apr 11, 2022
Also add a retroactive changelog entry for grafana-cold-storage#1584
rfratto added a commit that referenced this pull request Apr 11, 2022
* bump version of github-exporter

This bumps the version of github-exporter to the latest upstream commit,
fixing numerous bugs since the latest development release.

Closes #1588.

* add changelog entry

Also add a retroactive changelog entry for #1584
@rfratto rfratto added this to the v0.24.1 milestone Apr 13, 2022
rfratto added a commit to rfratto/agent that referenced this pull request Apr 14, 2022
* bump version of github-exporter

This bumps the version of github-exporter to the latest upstream commit,
fixing numerous bugs since the latest development release.

Closes grafana-cold-storage#1588.

* add changelog entry

Also add a retroactive changelog entry for grafana-cold-storage#1584

(cherry picked from commit 61e8f37)
rfratto pushed a commit to rfratto/agent that referenced this pull request Apr 14, 2022
@rfratto rfratto mentioned this pull request Apr 14, 2022
rfratto added a commit that referenced this pull request Apr 14, 2022
* Set up the default logger parameters (#1611)

* Set up the default logger parameters

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

* Set up the default logger parameters vol.2

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

* pkg/operator/config: don't set non-existent username_file field (#1612)

PR #1441 introduced a change to use password_file for basic auth, but
accidentally also generated a username_file field which doesn't exist.

(cherry picked from commit 378ffed)

* Bump GitHub exporter version (#1589)

* bump version of github-exporter

This bumps the version of github-exporter to the latest upstream commit,
fixing numerous bugs since the latest development release.

Closes #1588.

* add changelog entry

Also add a retroactive changelog entry for #1584

(cherry picked from commit 61e8f37)

* udpate import order in agentctl main.go (#1584)

(cherry picked from commit 78aa623)

* Embed time zone data for logs package (#1594)

(cherry picked from commit 2c53aff)

* changelog: add changelog entry for agentctl version info bugfix

* Set `Content-Type` as `application/json` to JSON endpoints (#1596)

* Set json content-type to JSON endpoints

* Update CHANGELOG

(cherry picked from commit cff7cb4)

* prepare for 0.24.1 release

Co-authored-by: Paschalis Tsilias <tpaschalis@users.noreply.github.com>
Co-authored-by: Robert Lankford <robert.lankford@grafana.com>
Co-authored-by: Marc Tudurí <marctc@protonmail.com>
mattdurham added a commit that referenced this pull request Apr 14, 2022
* Initial windows support for certificate store

* Fix linting

* Fix linting

* Clarify message

* staging

* Update check for clientstore closing

* Cleanup and tests

* merge from main

* Fix tests

* udpate import order in agentctl main.go (#1584)

* Improve debug messages on smoke test scrupt (#1553)

Add seconds as unit of time measure when script mentions TEST_DURATION  in smoke test script

* Add Logs system API endpoints for instance and targets (#1582)

* Add Logs system API endpoints for instance and targets

* Remove method

* Update CHANGELOG

* Bump loki

* Fix tests and lint

* Fix tests

* fix author

* Add documentation

* Update changelog

* Changes regarding formatting and minor changes from PR

* Feedback from PR and fixed bug with the update timer not always running

* Update docs/user/configuration/server-config.md

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>

* Fix linting rule on non windows platforms

* Fix linting rule on non windows platforms

* Fix linting rule on non windows platforms

* Fix linting rule on non windows platforms

* Fix linting rule on non windows platforms

* Allow client certificate to NOT be defined in some cases. Change of configuration to separate client/server blocks

* Refactor naming for linting

* Very rough implementation of credentials

Co-authored-by: matt durham <matt@simplify.dev>
Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.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 Mar 29, 2024
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Mar 29, 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