Skip to content

Commit f171294

Browse files
committed
fix(mimir): edit mimir model
1 parent 446446f commit f171294

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

app/media/MyGrafana/mimir.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ datasources:
99
editable: true
1010
version: 1
1111
jsonData:
12-
httpHeaderName1: X-Scope-OrgID
1312
alertmanagerUid: alertmanager

app/models/grafana/mimir_models.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@
55

66
class MultiTenancy(BaseModel):
77
tenant_name:str = "pods"
8-
8+
httpHeaderName1:str = "X-Scope-OrgID"
99
class MimirInput(BaseModel):
1010
name:str = "Mimir"
1111
uid:str = "mimir"
1212
url:str = "http://mimir-nginx.mimir.svc.cluster.local/prometheus"
1313
editable: bool = True
14-
httpHeaderName1:str = "X-Scope-OrgID"
1514
alertmanagerUid:str = "alertmanager"
1615
multi_tenancy:Optional[MultiTenancy]
1716

app/template_generators/grafana_data_sources/mimir.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def mimir_template(input):
1616
"editable": input.editable,
1717
"version": 1,
1818
"jsonData": {
19-
"httpHeaderName1": input.httpHeaderName1,
19+
"httpHeaderName1": input.multi_tenancy.httpHeaderName1,
2020
"alertmanagerUid": input.alertmanagerUid
2121
},
2222
"secureJsonData": {
@@ -48,7 +48,6 @@ def mimir_template(input):
4848
"editable": input.editable,
4949
"version": 1,
5050
"jsonData": {
51-
"httpHeaderName1": input.httpHeaderName1,
5251
"alertmanagerUid": input.alertmanagerUid
5352
},
5453

app/template_generators/grafana_data_sources/prometheus.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
import yaml
22
import os
3-
from ruamel.yaml import YAML
3+
import ruamel.yaml
44
from ruamel.yaml.scalarstring import ScalarString
55
import re
6+
7+
class SingleQuotedScalarString(ScalarString):
8+
def __new__(cls, value):
9+
return ScalarString.__new__(cls, value)
10+
611
def pormetheus_template(input):
712

813

0 commit comments

Comments
 (0)