diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-06-11 17:06:44 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-06-11 17:06:44 +0000 |
| commit | a7f50426a3098892de1a56f76e6e09cb97e64b2d (patch) | |
| tree | c9e363dde0c577fe8a7305f0185b6c994f260c10 /doc | |
| parent | a6e90010ec0a9a3b68700f31825480df08cd2e29 (diff) | |
| parent | debd7d2b3f4c74b0fda5a1920688bda534a5bf00 (diff) | |
| download | gitlab-ce-a7f50426a3098892de1a56f76e6e09cb97e64b2d.tar.gz | |
Merge branch 'patch-58' into 'master'
Alertmanager on omnibus requires configuration
See merge request gitlab-org/gitlab-ce!28398
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/development/architecture.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/development/architecture.md b/doc/development/architecture.md index dceee4f4670..26f2e4f4762 100644 --- a/doc/development/architecture.md +++ b/doc/development/architecture.md @@ -125,7 +125,7 @@ Component statuses are linked to configuration documentation for each component. | [PgBouncer](#pgbouncer) | Database connection pooling, failover | [⚙][pgbouncer-omnibus] | [❌][pgbouncer-charts] | [❌][pgbouncer-charts] | [✅](https://about.gitlab.com/handbook/engineering/infrastructure/production-architecture/#database-architecture) | ❌ | ❌ | EE Only | | [Consul](#consul) | Database node discovery, failover | [⚙][consul-omnibus] | [❌][consul-charts] | [❌][consul-charts] | [✅](../user/gitlab_com/index.md#consul) | ❌ | ❌ | EE Only | | [GitLab self-monitoring: Prometheus](#prometheus) | Time-series database, metrics collection, and query service | [✅][prometheus-omnibus] | [✅][prometheus-charts] | [⚙][prometheus-charts] | [✅](../user/gitlab_com/index.md#prometheus) | ❌ | ❌ | CE & EE | -| [GitLab self-monitoring: Alertmanager](#alertmanager) | Deduplicates, groups, and routes alerts from Prometheus | [✅][alertmanager-omnibus] | [✅][alertmanager-charts] | [⚙][alertmanager-charts] | [✅](https://about.gitlab.com/handbook/engineering/monitoring/) | ❌ | ❌ | CE & EE | +| [GitLab self-monitoring: Alertmanager](#alertmanager) | Deduplicates, groups, and routes alerts from Prometheus | [⚙][alertmanager-omnibus] | [✅][alertmanager-charts] | [⚙][alertmanager-charts] | [✅](https://about.gitlab.com/handbook/engineering/monitoring/) | ❌ | ❌ | CE & EE | | [GitLab self-monitoring: Grafana](#grafana) | Metrics dashboard | [⚙][grafana-omnibus] | [⤓][grafana-charts] | [⤓][grafana-charts] | [✅](https://dashboards.gitlab.com/d/RZmbBr7mk/gitlab-triage?refresh=30s) | ❌ | ❌ | CE & EE | | [GitLab self-monitoring: Sentry](#sentry) | Track errors generated by the GitLab instance | [⤓][sentry-omnibus] | [❌][sentry-charts] | [❌][sentry-charts] | [✅](https://about.gitlab.com/handbook/support/workflows/services/gitlab_com/500_errors.html#searching-sentry) | [⤓][gitlab-yml] | [⤓][gitlab-yml] | CE & EE | | [GitLab self-monitoring: Jaeger](#jaeger) | View traces generated by the GitLab instance | [❌][jaeger-omnibus] | [❌][jaeger-charts] | [❌][jaeger-charts] | [❌](https://gitlab.com/gitlab-org/omnibus-gitlab/issues/4104) | [⤓][jaeger-source] | [⚙][jaeger-gdk] | CE & EE | |