summaryrefslogtreecommitdiff
path: root/doc/integration
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2016-01-20 12:05:03 +0100
committerYorick Peterse <yorickpeterse@gmail.com>2016-01-20 12:05:03 +0100
commit6f32459f2c0ebc0aa10c728e5562375db9cf4c52 (patch)
treebca71417082d85291f003ba69874a66242c3646b /doc/integration
parentd4c05766c7a058cbf62186723216d754eebad92e (diff)
downloadgitlab-ce-6f32459f2c0ebc0aa10c728e5562375db9cf4c52.tar.gz
Renamed "Metrics" to "Performance Monitoring"metrics-documentation
Diffstat (limited to 'doc/integration')
-rw-r--r--doc/integration/README.md2
-rw-r--r--doc/integration/metrics/gitlab_configuration.md6
-rw-r--r--doc/integration/metrics/influxdb_configuration.md2
-rw-r--r--doc/integration/metrics/influxdb_schema.md2
-rw-r--r--doc/integration/metrics/introduction.md10
5 files changed, 11 insertions, 11 deletions
diff --git a/doc/integration/README.md b/doc/integration/README.md
index 5ba0d0fb245..297e4f6e7bf 100644
--- a/doc/integration/README.md
+++ b/doc/integration/README.md
@@ -15,7 +15,7 @@ See the documentation below for details on how to configure these services.
- [OAuth2 provider](oauth_provider.md) OAuth2 application creation
- [Gmail actions buttons](gmail_action_buttons_for_gitlab.md) Adds GitLab actions to messages
- [reCAPTCHA](recaptcha.md) Configure GitLab to use Google reCAPTCHA for new users
-- [GitLab Metrics](metrics/introduction.md) Configure GitLab and InfluxDB for measuring performance metrics
+- [GitLab Performance Monitoring](metrics/introduction.md) Configure GitLab and InfluxDB for measuring performance metrics
GitLab Enterprise Edition contains [advanced Jenkins support][jenkins].
diff --git a/doc/integration/metrics/gitlab_configuration.md b/doc/integration/metrics/gitlab_configuration.md
index 019db1ad02c..b856e7935a3 100644
--- a/doc/integration/metrics/gitlab_configuration.md
+++ b/doc/integration/metrics/gitlab_configuration.md
@@ -1,6 +1,6 @@
# GitLab Configuration
-GitLab Metrics is disabled by default. To enable it and change any of its
+GitLab Performance Monitoring is disabled by default. To enable it and change any of its
settings, navigate to the Admin area in **Settings > Metrics**
(`/admin/application_settings`).
@@ -10,7 +10,7 @@ changes.
---
-![GitLab Metrics Admin Settings](img/metrics_gitlab_configuration_settings.png)
+![GitLab Performance Monitoring Admin Settings](img/metrics_gitlab_configuration_settings.png)
---
@@ -34,6 +34,6 @@ have been performed.
Read more on:
-- [Introduction to GitLab Metrics](introduction.md)
+- [Introduction to GitLab Performance Monitoring](introduction.md)
- [InfluxDB Configuration](influxdb_configuration.md)
- [InfluxDB Schema](influxdb_schema.md)
diff --git a/doc/integration/metrics/influxdb_configuration.md b/doc/integration/metrics/influxdb_configuration.md
index 13227f1e889..df5e4af7fad 100644
--- a/doc/integration/metrics/influxdb_configuration.md
+++ b/doc/integration/metrics/influxdb_configuration.md
@@ -178,7 +178,7 @@ That's it! Now your GitLab instance should send data to InfluxDB.
Read more on:
-- [Introduction to GitLab Metrics](introduction.md)
+- [Introduction to GitLab Performance Monitoring](introduction.md)
- [GitLab Configuration](gitlab_configuration.md)
- [InfluxDB Schema](influxdb_schema.md)
diff --git a/doc/integration/metrics/influxdb_schema.md b/doc/integration/metrics/influxdb_schema.md
index a9ef0b446c8..a5a8aebd2d1 100644
--- a/doc/integration/metrics/influxdb_schema.md
+++ b/doc/integration/metrics/influxdb_schema.md
@@ -82,6 +82,6 @@ view.
Read more on:
-- [Introduction to GitLab Metrics](introduction.md)
+- [Introduction to GitLab Performance Monitoring](introduction.md)
- [GitLab Configuration](gitlab_configuration.md)
- [InfluxDB Configuration](influxdb_configuration.md)
diff --git a/doc/integration/metrics/introduction.md b/doc/integration/metrics/introduction.md
index bf388aa2bba..f2460d31302 100644
--- a/doc/integration/metrics/introduction.md
+++ b/doc/integration/metrics/introduction.md
@@ -1,19 +1,19 @@
-# GitLab Metrics
+# GitLab Performance Monitoring
GitLab comes with its own application performance measuring system as of GitLab
-8.4, simply called "GitLab Metrics". GitLab Metrics is available in both the
+8.4, simply called "GitLab Performance Monitoring". GitLab Performance Monitoring is available in both the
Community and Enterprise editions.
Apart from this introduction, you are advised to read through the following
-documents in order to understand and properly configure GitLab Metrics:
+documents in order to understand and properly configure GitLab Performance Monitoring:
- [GitLab Configuration](gitlab_configuration.md)
- [InfluxDB Configuration](influxdb_configuration.md)
- [InfluxDB Schema](influxdb_schema.md)
-## Introduction to GitLab Metrics
+## Introduction to GitLab Performance Monitoring
-GitLab Metrics makes it possible to measure a wide variety of statistics
+GitLab Performance Monitoring makes it possible to measure a wide variety of statistics
including (but not limited to):
- The time it took to complete a transaction (a web request or Sidekiq job).