Skip to content

Commit 38f31b1

Browse files
fix(grafana,alloy): remove editor panel from client dashboards and fix label replacement
- Strip embedded server-editor panel (id 90) from client drilldown dashboards to enforce read-only access for client viewers - Fix dollar sign escaping in Alloy blackbox relabel configuration to prevent shell variable interpolation - Client viewers can now only view dashboards without ability to modify server configurations
1 parent dcde155 commit 38f31b1

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

api/app/grafana.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,8 @@ def _build_client_drilldowns(client, prom_uid, inf_uid):
184184
obj = json.loads(raw)
185185
d = obj["dashboard"]
186186
d["templating"] = {"list": _client_drilldown_vars(client, inf_uid, with_port=(suffix == "dd-port"))}
187+
# client viewers are read-only: strip the embedded server-editor row (id 90)
188+
d["panels"] = [p for p in d.get("panels", []) if p.get("id") != 90]
187189
d.pop("id", None)
188190
obj.pop("folderUid", None)
189191
obj["overwrite"] = True

install-alloy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ prometheus.relabel "blackbox_labels" {
269269
source_labels = ["job"]
270270
regex = "(?:integrations/blackbox/)?(.+)"
271271
target_label = "port"
272-
replacement = "$1"
272+
replacement = "\$1"
273273
}
274274
rule {
275275
target_label = "job"

0 commit comments

Comments
 (0)