Skip to content

Commit

Permalink
Merge branch 'main' into fix/remove-disk-io-alerts
Browse files Browse the repository at this point in the history
  • Loading branch information
sed-i authored Aug 27, 2024
2 parents 1ef7514 + 64cb7ee commit 445ac3c
Show file tree
Hide file tree
Showing 25 changed files with 1,323 additions and 257 deletions.
1 change: 0 additions & 1 deletion charmcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ bases:
architectures: ["amd64"]
parts:
charm:
charm-strict-dependencies: true
build-packages:
- git

Expand Down
30 changes: 30 additions & 0 deletions config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,33 @@ options:
Supported units: y, w, d, h, m, s.
type: string
default: "1m"
always_enable_zipkin:
description: >
Force-enable the receiver for the 'zipkin' protocol in Grafana Agent,
even if there is no integration currently requesting it.
type: boolean
default: false
always_enable_otlp_grpc:
description: >
Force-enable the receiver for the 'otlp_grpc' protocol in Grafana Agent,
even if there is no integration currently requesting it.
type: boolean
default: false
always_enable_otlp_http:
description: >
Force-enable the receiver for the 'otlp_http' protocol in Grafana Agent,
even if there is no integration currently requesting it.
type: boolean
default: false
always_enable_jaeger_grpc:
description: >
Force-enable the receiver for the 'jaeger_grpc' protocol in Grafana Agent,
even if there is no integration currently requesting it.
type: boolean
default: false
always_enable_jaeger_thrift_http:
description: >
Force-enable the receiver for the 'jaeger_thrift_http' protocol in Grafana Agent,
even if there is no integration currently requesting it.
type: boolean
default: false
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ def _on_certificate_removed(self, event: CertificateRemovedEvent):
"""


import json
import logging
from typing import List, Mapping
Expand All @@ -113,7 +112,7 @@ def _on_certificate_removed(self, event: CertificateRemovedEvent):

# Increment this PATCH version before using `charmcraft publish-lib` or reset
# to 0 if you are raising the major API version
LIBPATCH = 7
LIBPATCH = 8

PYDEPS = ["jsonschema"]

Expand Down
Loading

0 comments on commit 445ac3c

Please sign in to comment.