Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc/user
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-31 12:08:16 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-31 12:08:16 +0300
commit6044caed20964a70c1ac6c5a3365d567ed96dfde (patch)
tree3fe8f14b4acbd542265544843efeb6f59b5d3efe /doc/user
parent92077e0f8d70c70a908395808b16f98ecd3a5fcd (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
-rw-r--r--doc/user/project/integrations/img/embed_metrics.pngbin102552 -> 0 bytes
-rw-r--r--doc/user/project/integrations/img/hide_embedded_metrics_v12_10.pngbin0 -> 21312 bytes
-rw-r--r--doc/user/project/integrations/img/view_embedded_metrics_v12_10.pngbin0 -> 36717 bytes
-rw-r--r--doc/user/project/integrations/prometheus.md6
4 files changed, 5 insertions, 1 deletions
diff --git a/doc/user/project/integrations/img/embed_metrics.png b/doc/user/project/integrations/img/embed_metrics.png
deleted file mode 100644
index 6f9660c9aec..00000000000
--- a/doc/user/project/integrations/img/embed_metrics.png
+++ /dev/null
Binary files differ
diff --git a/doc/user/project/integrations/img/hide_embedded_metrics_v12_10.png b/doc/user/project/integrations/img/hide_embedded_metrics_v12_10.png
new file mode 100644
index 00000000000..1213029d1d1
--- /dev/null
+++ b/doc/user/project/integrations/img/hide_embedded_metrics_v12_10.png
Binary files differ
diff --git a/doc/user/project/integrations/img/view_embedded_metrics_v12_10.png b/doc/user/project/integrations/img/view_embedded_metrics_v12_10.png
new file mode 100644
index 00000000000..95bb148ba71
--- /dev/null
+++ b/doc/user/project/integrations/img/view_embedded_metrics_v12_10.png
Binary files differ
diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md
index 04be63de5ea..86f00cdcc1c 100644
--- a/doc/user/project/integrations/prometheus.md
+++ b/doc/user/project/integrations/prometheus.md
@@ -777,7 +777,11 @@ The following requirements must be met for the metric to unfurl:
If all of the above are true, then the metric will unfurl as seen below:
-![Embedded Metrics](img/embed_metrics.png)
+![Embedded Metrics](img/view_embedded_metrics_v12_10.png)
+
+Metric charts may also be hidden:
+
+![Show Hide](img/hide_embedded_metrics_v12_10.png)
### Embedding metrics in issue templates