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

Add support for free-standing loki rules and grafana dashboards #6

Merged
merged 4 commits into from
Jan 31, 2022

Conversation

config.yaml Outdated Show resolved Hide resolved
config.yaml Outdated Show resolved Hide resolved
config.yaml Outdated Show resolved Hide resolved
config.yaml Outdated Show resolved Hide resolved
config.yaml Outdated Show resolved Hide resolved
@sed-i sed-i force-pushed the add-loki branch 3 times, most recently from 3ee7b9d to 6454472 Compare January 21, 2022 20:48
@sed-i sed-i changed the title Add loki Add support for free-standing loki rules and grafana dashboards Jan 25, 2022
config.yaml Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
description: URL to repo to sync against
git-sync::branch:
description: URL to repo to clone and sync against.
git_branch:
Copy link
Contributor

Choose a reason for hiding this comment

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

git_reference

Copy link
Contributor Author

Choose a reason for hiding this comment

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

git_branch and git_rev are both defined and both needed. git-sync has defaults for both so we're good. Can provide git_rev and omit the branch. It's impossible to clone a revision - only after cloning a branch can checkout a revision.

Copy link
Contributor

@mmanciop mmanciop left a comment

Choose a reason for hiding this comment

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

See comments inline

config.yaml Show resolved Hide resolved
@@ -0,0 +1,280 @@
# Copyright 2021 Canonical Ltd.
Copy link
Contributor

Choose a reason for hiding this comment

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

Actually I do not think we care to fix the K8s service at all: this charm does not expose any web api we care to invoke from the outside, and this makes us need —trust. I’d say we just don’t fix this K8s service instead.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

git-sync has http api for "health" and /metrics

requirements.txt Show resolved Hide resolved
src/charm.py Outdated Show resolved Hide resolved
@sed-i
Copy link
Contributor Author

sed-i commented Jan 29, 2022

Recent changes to prom and loki broke integration tests.
Reviews are welcome but addition fixes are probably coming up.

@sed-i sed-i marked this pull request as ready for review January 29, 2022 09:41
@sed-i sed-i dismissed stale reviews from mmanciop and simskij January 29, 2022 09:41

both branch and rev are needed.

@sed-i sed-i merged commit 774f0d5 into canonical:main Jan 31, 2022
@sed-i sed-i deleted the add-loki branch January 31, 2022 17:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants