mirror of
https://github.com/tdurieux/anonymous_github.git
synced 2026-11-17 17:44:09 +01:00
fix: use datasource-native regex variable interpolation
This commit is contained in:
1 parent
7f3cf71bc3
commit
87882c5a4b
2 files changed
+3
-3
No files matched your search
@@ -110,11 +110,11 @@
|
||||
"targets": [
|
||||
{
|
||||
"refId": "A",
|
||||
"expr": "service:~${service:json} release:~${release:json} event:~${event:json}",
|
||||
"expr": "service:~\"$service\" release:~\"$release\" event:~\"$event\"",
|
||||
"queryType": "instant",
|
||||
"editorMode": "code",
|
||||
"maxLines": 200,
|
||||
"packJson": true
|
||||
"packJson": false
|
||||
}
|
||||
],
|
||||
"options": {
|
||||
|
||||
@@ -34,7 +34,7 @@ def query(panel, target, start=None, end=None):
|
||||
for name in ['request_id', 'job_id', 'edge_id']:
|
||||
target['expr'] = target['expr'].replace('${' + name + ':json}', '"fixture-not-present"').replace('$' + name, 'fixture-not-present')
|
||||
for name in ['service', 'release', 'event']:
|
||||
target['expr'] = target['expr'].replace('${' + name + ':json}', '".*"').replace('$' + name, '*')
|
||||
target['expr'] = target['expr'].replace('${' + name + ':json}', '".*"').replace('$' + name, '.*')
|
||||
result = request('/api/ds/query', {'from': str(start or int((time.time()-3600)*1000)),
|
||||
'to': str(end or int(time.time()*1000)), 'queries': [target]})['results'][target['refId']]
|
||||
assert not result.get('error'), (panel['title'], result.get('error'))
|
||||
|
||||
Reference in new issue
Block a user