Commit 5cd7a57c authored by Craig Norris's avatar Craig Norris

Merge branch 'aqualls-last-monitor-future-tense' into 'master'

Fix stray future tense wording in Monitor docs

See merge request gitlab-org/gitlab!48073
parents 042f1a74 ac594111
...@@ -39,8 +39,8 @@ metrics exposed by the [GitLab exporter](../prometheus/gitlab_metrics.md#metrics ...@@ -39,8 +39,8 @@ metrics exposed by the [GitLab exporter](../prometheus/gitlab_metrics.md#metrics
## Deleting the self monitoring project ## Deleting the self monitoring project
CAUTION: **Warning:** CAUTION: **Warning:**
If you delete the self monitoring project, you will lose any changes made to the Deleting the self monitoring project removes any changes made to the project. If
project. If you create the project again, it is created in its default state. you create the project again, it's created in its default state.
1. Navigate to **Admin Area > Settings > Metrics and profiling**, and expand the **Self monitoring** section. 1. Navigate to **Admin Area > Settings > Metrics and profiling**, and expand the **Self monitoring** section.
1. Toggle the **Create Project** button off. 1. Toggle the **Create Project** button off.
......
...@@ -131,8 +131,8 @@ data. ...@@ -131,8 +131,8 @@ data.
Unless a field type is explicitly mapped, Elasticsearch infers the type from Unless a field type is explicitly mapped, Elasticsearch infers the type from
the first instance of that field value it sees. Subsequent instances of that the first instance of that field value it sees. Subsequent instances of that
field value with different types will either fail to be indexed, or in some field value with different types either fail to be indexed, or in some
cases (scalar/object conflict), the whole log line will be dropped. cases (scalar/object conflict), the whole log line is dropped.
GitLab.com's logging Elasticsearch sets GitLab.com's logging Elasticsearch sets
[`ignore_malformed`](https://www.elastic.co/guide/en/elasticsearch/reference/current/ignore-malformed.html), [`ignore_malformed`](https://www.elastic.co/guide/en/elasticsearch/reference/current/ignore-malformed.html),
...@@ -311,7 +311,7 @@ It should be noted that manual logging of exceptions is not allowed, as: ...@@ -311,7 +311,7 @@ It should be noted that manual logging of exceptions is not allowed, as:
1. Very often manually logged exception needs to be tracked to Sentry as well, 1. Very often manually logged exception needs to be tracked to Sentry as well,
1. Manually logged exceptions does not use `correlation_id`, which makes hard 1. Manually logged exceptions does not use `correlation_id`, which makes hard
to pin them to request, user and context in which this exception was raised, to pin them to request, user and context in which this exception was raised,
1. It is very likely that manually logged exceptions will end-up across 1. Manually logged exceptions often end up across
multiple files, which increases burden scraping all logging files. multiple files, which increases burden scraping all logging files.
To avoid duplicating and having consistent behavior the `Gitlab::ErrorTracking` To avoid duplicating and having consistent behavior the `Gitlab::ErrorTracking`
......
...@@ -174,7 +174,7 @@ DANGER: **Deprecated:** ...@@ -174,7 +174,7 @@ DANGER: **Deprecated:**
We are building deeper integration with Opsgenie and other alerting tools through We are building deeper integration with Opsgenie and other alerting tools through
[HTTP endpoint integrations](#generic-http-endpoint) so you can see alerts within [HTTP endpoint integrations](#generic-http-endpoint) so you can see alerts within
the GitLab interface. As a result, the previous direct link to Opsgenie Alerts from the GitLab interface. As a result, the previous direct link to Opsgenie Alerts from
the GitLab alerts list will be deprecated following the 13.7 release on December 22, 2020. the GitLab alerts list is scheduled for deprecation following the 13.7 release on December 22, 2020.
> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/3066) in [GitLab Premium](https://about.gitlab.com/pricing/) 13.2. > [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/3066) in [GitLab Premium](https://about.gitlab.com/pricing/) 13.2.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment