Merge "fix(loki-stack): enable seeing logs for dev pipeline"

This commit is contained in:
Zuul 2021-04-02 14:13:27 +00:00 committed by Gerrit Code Review
commit 844d4481f2

View File

@ -412,6 +412,14 @@ loki-stack:
enabled: true enabled: true
persistence: persistence:
enabled: true enabled: true
datasources:
datasources.yaml:
apiVersion: 1
datasources:
- name: PromLoki
type: prometheus
url: http://loki:3100/loki/
access: proxy
grafana.ini: grafana.ini:
auth.anonymous: auth.anonymous:
enabled: true enabled: true
@ -629,8 +637,8 @@ loki-stack:
"text": "All", "text": "All",
"value": "$__all" "value": "$__all"
}, },
"datasource": "Loki", "datasource": "PromLoki",
"definition": "label_values(kube_pod_info, namespace)", "definition": "label_values(namespace)",
"hide": 0, "hide": 0,
"includeAll": true, "includeAll": true,
"index": -1, "index": -1,
@ -638,7 +646,7 @@ loki-stack:
"multi": false, "multi": false,
"name": "namespace", "name": "namespace",
"options": [], "options": [],
"query": "label_values(kube_pod_info, namespace)", "query": "label_values(namespace)",
"refresh": 1, "refresh": 1,
"regex": "/.*^(?!loki)/", "regex": "/.*^(?!loki)/",
"skipUrlSync": false, "skipUrlSync": false,
@ -650,14 +658,14 @@ loki-stack:
"useTags": false "useTags": false
}, },
{ {
"allValue": "^$namespace.*", "allValue": "",
"current": { "current": {
"selected": false, "selected": false,
"text": "All", "text": "All",
"value": "$__all" "value": "$__all"
}, },
"datasource": "Loki", "datasource": "PromLoki",
"definition": "label_values(mixin_pod_workload{namespace=\"$namespace\"}, tekton_dev_pipeline)", "definition": "label_values({namespace=\"$namespace\"}, tekton_dev_pipeline)",
"hide": 0, "hide": 0,
"includeAll": true, "includeAll": true,
"index": -1, "index": -1,
@ -665,9 +673,9 @@ loki-stack:
"multi": false, "multi": false,
"name": "tekton_dev_pipeline", "name": "tekton_dev_pipeline",
"options": [], "options": [],
"query": "label_values(mixin_pod_workload{namespace=\"namespace\"}, tekton_dev_pipeline)", "query": "label_values({namespace=\"$namespace\"}, tekton_dev_pipeline)",
"refresh": 1, "refresh": 1,
"regex": "^$namespace.*", "regex": "^.*",
"skipUrlSync": false, "skipUrlSync": false,
"sort": 5, "sort": 5,
"tagValuesQuery": "", "tagValuesQuery": "",
@ -677,14 +685,14 @@ loki-stack:
"useTags": false "useTags": false
}, },
{ {
"allValue": "^$namespace.*", "allValue": "",
"current": { "current": {
"selected": false, "selected": false,
"text": "All", "text": "All",
"value": "$__all" "value": "$__all"
}, },
"datasource": "Loki", "datasource": "PromLoki",
"definition": "label_values(mixin_pod_workload{namespace=\"$namespace\"}, tekton_dev_pipelineRun)", "definition": "label_values({namespace=\"$namespace\",tekton_dev_pipeline=\"$tekton_dev_pipeline\"}, tekton_dev_pipelineRun)",
"hide": 0, "hide": 0,
"includeAll": true, "includeAll": true,
"index": -1, "index": -1,
@ -692,9 +700,9 @@ loki-stack:
"multi": false, "multi": false,
"name": "tekton_dev_pipelineRun", "name": "tekton_dev_pipelineRun",
"options": [], "options": [],
"query": "label_values(mixin_pod_workload{namespace=\"$namespace\"}, tekton_dev_pipelineRun)", "query": "label_values({namespace=\"$namespace\",tekton_dev_pipeline=\"$tekton_dev_pipeline\"}, tekton_dev_pipelineRun)",
"refresh": 1, "refresh": 1,
"regex": "^$namespace.*", "regex": ".*",
"skipUrlSync": false, "skipUrlSync": false,
"sort": 5, "sort": 5,
"tagValuesQuery": "", "tagValuesQuery": "",
@ -704,14 +712,14 @@ loki-stack:
"useTags": false "useTags": false
}, },
{ {
"allValue": "^$namespace.*", "allValue": "",
"current": { "current": {
"selected": false, "selected": false,
"text": "All", "text": "All",
"value": "$__all" "value": "$__all"
}, },
"datasource": "Loki", "datasource": "PromLoki",
"definition": "label_values(mixin_pod_workload{namespace=\"$namespace\"}, tekton_dev_taskRun)", "definition": "label_values({namespace=\"$namespace\",tekton_dev_pipeline=\"$tekton_dev_pipeline\",tekton_dev_pipelineRun=\"$tekton_dev_pipelineRun\"}, tekton_dev_taskRun)",
"hide": 0, "hide": 0,
"includeAll": true, "includeAll": true,
"index": -1, "index": -1,
@ -719,9 +727,9 @@ loki-stack:
"multi": false, "multi": false,
"name": "tekton_dev_taskRun", "name": "tekton_dev_taskRun",
"options": [], "options": [],
"query": "label_values(mixin_pod_workload{namespace=\"$namespace\"}, tekton_dev_taskRun)", "query": "label_values({namespace=\"$namespace\",tekton_dev_pipeline=\"$tekton_dev_pipeline\",tekton_dev_pipelineRun=\"$tekton_dev_pipelineRun\"}, tekton_dev_taskRun)",
"refresh": 1, "refresh": 1,
"regex": "^$namespace.*", "regex": "^.*",
"skipUrlSync": false, "skipUrlSync": false,
"sort": 5, "sort": 5,
"tagValuesQuery": "", "tagValuesQuery": "",