IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/utkarshcmu/grafana into docs-refac

Browse Source
This commit is contained in:
utkarshcmu
2016-02-10 23:12:41 -08:00
parent 0201b9769c e37817285a
commit c3fc340c09
220 changed files with 7048 additions and 33401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/sources/datasources/prometheus.md
View File

@@ -48,6 +48,7 @@ Name | Description
`label_values(label)` | Returns a list of label values for the `label` in every metric.
`label_values(metric, label)` | Returns a list of label values for the `label` in the specified metric.
`metrics(metric)` | Returns a list of metrics matching the specified `metric` regex.
`query_result(query)` | Returns a list of Prometheus query result for the `query`.
For details of `metric names` & `label names`, and `label values`, please refer to the [Prometheus documentation](http://prometheus.io/docs/concepts/data_model/#metric-names-and-labels).

1
docs/sources/installation/configuration.md
View File

@@ -268,6 +268,7 @@ example:
scopes = user:email
auth_url = https://github.com/login/oauth/authorize
token_url = https://github.com/login/oauth/access_token
api_url = https://api.github.com
allow_sign_up = false
team_ids =