diff options
author | Evan Read <eread@gitlab.com> | 2019-07-19 05:10:14 +0300 |
---|---|---|
committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-07-30 18:25:15 +0300 |
commit | 0b35e771b34aab3c411194f3efdf7964ca148865 (patch) | |
tree | 9230e7792eaaabdd6881b8913ed08277cd30a1c0 /doc | |
parent | bcc9298eeac27bfc1b27fa9b62dab5996ff6032f (diff) |
Merge branch 'docs-jivanvl-additional-panel-type-support' into 'master'
Add documentation for panel types
See merge request gitlab-org/gitlab-ce!30695
(cherry picked from commit acdb1f79688adae87933b34c3140e286ebab055c)
d5efb69f Add documentation for panel types
e9287a99 Apply suggestion to doc/user/project/integrations/prometheus.md
010de6cf Apply suggestion to doc/user/project/integrations/prometheus.md
55f0b4d2 Apply suggestion to doc/user/project/integrations/prometheus.md
07462a1f Apply suggestion to doc/user/project/integrations/prometheus.md
4a3d72fa Apply suggestion to doc/user/project/integrations/prometheus.md
a3f7fe49 Apply suggestion to doc/user/project/integrations/prometheus.md
b32a701e Apply suggestion to doc/user/project/integrations/prometheus.md
Diffstat (limited to 'doc')
-rw-r--r-- | doc/user/project/integrations/img/prometheus_dashboard_area_panel_type.png | bin | 0 -> 65101 bytes | |||
-rw-r--r-- | doc/user/project/integrations/img/prometheus_dashboard_single_stat_panel_type.png | bin | 0 -> 26781 bytes | |||
-rw-r--r-- | doc/user/project/integrations/prometheus.md | 61 |
3 files changed, 60 insertions, 1 deletions
diff --git a/doc/user/project/integrations/img/prometheus_dashboard_area_panel_type.png b/doc/user/project/integrations/img/prometheus_dashboard_area_panel_type.png Binary files differnew file mode 100644 index 00000000000..7260b11f07b --- /dev/null +++ b/doc/user/project/integrations/img/prometheus_dashboard_area_panel_type.png diff --git a/doc/user/project/integrations/img/prometheus_dashboard_single_stat_panel_type.png b/doc/user/project/integrations/img/prometheus_dashboard_single_stat_panel_type.png Binary files differnew file mode 100644 index 00000000000..ce4c54f909d --- /dev/null +++ b/doc/user/project/integrations/img/prometheus_dashboard_single_stat_panel_type.png diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md index 72f12972596..61c30e0b0ef 100644 --- a/doc/user/project/integrations/prometheus.md +++ b/doc/user/project/integrations/prometheus.md @@ -191,7 +191,7 @@ The following tables outline the details of expected properties. | Property | Type | Required | Description | | ------ | ------ | ------ | ------- | -| `type` | enum | no, defaults to `area-chart` | Specifies the chart type to use. Only `area-chart` is currently supported. | +| `type` | enum | no, defaults to `area-chart` | Specifies the chart type to use. | | `title` | string | yes | Heading for the panel. | | `y_label` | string | no, but highly encouraged | Y-Axis label for the panel. | | `weight` | number | no, defaults to order in file | Order to appear within the grouping. Lower number means higher priority, which will be higher on the page. Numbers do not need to be consecutive. | @@ -207,6 +207,65 @@ The following tables outline the details of expected properties. | `query` | string | yes if `query_range` is not defined | Defines the Prometheus query to be used to populate the chart/panel. If defined, the `query` endpoint of the [Prometheus API](https://prometheus.io/docs/prometheus/latest/querying/api/) will be utilized. | | `query_range` | string | yes if `query` is not defined | Defines the Prometheus query to be used to populate the chart/panel. If defined, the `query_range` endpoint of the [Prometheus API](https://prometheus.io/docs/prometheus/latest/querying/api/) will be utilized. | +#### Panel types for dashboards + +The below panel types are supported in monitoring dashboards. + +##### Area + +To add an area panel type to a dashboard, look at the following sample dashboard file: + +```yaml +dashboard: 'Dashboard Title' +panel_groups: + - group: 'Group Title' + panels: + - type: area-chart + title: "Chart Title" + y_label: "Y-Axis" + metrics: + - id: 10 + query_range: 'http_requests_total' + label: "Metric of Ages" + unit: "count" +``` + +Note the following properties: + +| Property | Type | Required | Description | +| ------ | ------ | ------ | ------ | +| type | string | no | Type of panel to be rendered. Optional for area panel types | +| query_range | yes | required | For area panel types, you must use a [range query](https://prometheus.io/docs/prometheus/latest/querying/api/#range-queries) | + +![area panel type](img/prometheus_dashboard_area_panel_type.png) + +##### Single Stat + +To add a single stat panel type to a dashboard, look at the following sample dashboard file: + +```yaml +dashboard: 'Dashboard Title' +panel_groups: + - group: 'Group Title' + panels: + - title: "Single Stat" + type: "single-stat" + metrics: + - id: 10 + query: 'max(go_memstats_alloc_bytes{job="prometheus"})' + unit: MB + label: "Total" +``` + +Note the following properties: + +| Property | Type | Required | Description | +| ------ | ------ | ------ | ------ | +| type | string | yes | Type of panel to be rendered. For single stat panel types, set to `single-stat` | +| query | string | yes | For single stat panel types, you must use an [instant query](https://prometheus.io/docs/prometheus/latest/querying/api/#instant-queries) | + +![single stat panel type](img/prometheus_dashboard_single_stat_panel_type.png) + ### Setting up alerts for Prometheus metrics **(ULTIMATE)** #### Managed Prometheus instances |