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.

Sign up for GitHub

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

Refactor dashboard utils #370

Merged
merged 7 commits into from
Jan 10, 2025
Merged

Refactor dashboard utils #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
85946f8
Refactor dashboard utils
sed-i Jan 9, 2025
c77a38f
Bump LIBPATH
sed-i Jan 9, 2025
b4c9a9d
Use LZMABase64 class from coslib
sed-i Jan 9, 2025
c9d32a2
Install cosl for static-lib too
sed-i Jan 9, 2025
aef663d
Add cosl to grafana tester
sed-i Jan 10, 2025
48fd0ef
Add cosl to grafana tester
sed-i Jan 10, 2025
20d7cff
Import main from ops
sed-i Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charmcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ parts:
charm:
# This is currently necessary because it cuts on packing times.
# It can be removed when we have at least multithreading on charmcraft pack.
charm-binary-python-packages: [cryptography, jsonschema, pydantic, maturin]
charm-binary-python-packages: [cryptography, jsonschema, pydantic, pydantic-core, maturin]
build-packages:
- git
static-sqlite3:
Expand Down
646 changes: 320 additions & 326 deletions lib/charms/grafana_k8s/v0/grafana_dashboard.py
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ urllib3
jsonschema
cryptography

# lib/charms/grafana_k8s/v0/grafana_dashboard.py
# lib/charms/tempo_k8s/v1/charm_tracing.py
cosl

# lib/charms/tempo_k8s/v1/charm_tracing.py
opentelemetry-exporter-otlp-proto-http
pydantic
cosl
2 changes: 1 addition & 1 deletion src/charm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
from charms.tempo_coordinator_k8s.v0.charm_tracing import trace_charm
from charms.tempo_coordinator_k8s.v0.tracing import TracingEndpointRequirer, charm_tracing_config
from ops.framework import StoredState
from ops.main import main
from ops import main
from ops.model import ActiveStatus, BlockedStatus, MaintenanceStatus, Port

from ops.pebble import (
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/grafana-tester/charmcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ bases:
channel: "20.04"
parts:
charm:
charm-binary-python-packages: [cryptography, jsonschema]
charm-binary-python-packages: [cryptography, jsonschema, pydantic, pydantic-core, maturin]
1 change: 1 addition & 0 deletions tests/integration/grafana-tester/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
ops
jsonschema
cosl
1 change: 1 addition & 0 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ deps =
charm: -r{toxinidir}/requirements.txt
lib: ops
lib: jinja2
lib: cosl
unit: {[testenv:unit]deps}
integration: {[testenv:integration]deps}
commands =
Expand Down
Loading