Skip to content

Commit 4f2e948

Browse files
committed
Merge branch 'diataxis' of https://github.com/nais/doc into diataxis
2 parents e27c469 + d47dfa4 commit 4f2e948

File tree

6 files changed

+19
-12
lines changed

6 files changed

+19
-12
lines changed

docs/explanation/observability/README.md

+14-12
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,13 @@ The tree pillars of observability are:
2323

2424
```mermaid
2525
graph
26-
A[Application] --> B((Logs))
27-
A --> C((Metrics))
28-
A --> D((Traces))
26+
A[Application] --> B((Logs))
27+
A --> C((Metrics))
28+
A --> D((Traces))
29+
30+
click B "#logs"
31+
click C "#metrics"
32+
click D "#traces"
2933
```
3034

3135
## Metrics
@@ -61,23 +65,20 @@ graph LR
6165
[:octicons-arrow-right-24: Access Grafana here][nais-grafana]
6266

6367
[grafana]: https://grafana.com/
64-
[nais-grafana]: https://grafana.nais.io/
68+
[nais-grafana]: https://grafana.nav.cloud.nais.io/
6569

6670
## Logs
6771

6872
Logs are a way to understand what is happening in your application. They are usually text-based and are often used for debugging. Since the format of logs is usually not standardized, it can be difficult to query and aggregate logs and thus we recommend using metrics for dashboards and alerting.
6973

70-
Logs are collected automatically by [fluentd][fluentd], stored in [Elasticsearch][elasticsearch] and made accessible via [Kibana][kibana].
71-
72-
[fluentd]: https://www.fluentd.org/
73-
[elasticsearch]: https://www.elastic.co/elasticsearch/
74-
[kibana]: https://www.elastic.co/kibana/
74+
Logs that are sent to console (`stdout`) are collected automatically and can be configured for persistent storage and querying in several ways.
7575

7676
```mermaid
7777
graph LR
78-
Application --stdout/stderr--> Fluentbit
79-
Fluentbit --> Elasticsearch
80-
Elasticsearch --> Kibana
78+
Application --stdout/stderr--> Router
79+
Router --> A[Secure Logs]
80+
Router --> B[Grafana Loki]
81+
Router --> C[Elastic / Kibana]
8182
```
8283

8384
[:octicons-arrow-right-24: Configure your logs](./logs.md)
@@ -125,6 +126,7 @@ graph LR
125126
Observability is a very broad topic and there is a lot more to learn. Here are some resources that you can use to learn more about observability:
126127

127128
- [:octicons-video-24: Monitoring, the Prometheus Way][youtube-prometheus]
129+
- [:octicons-book-24: SRE Book - Monitoring distributed systems][sre-book-monitoring]
128130
- [:octicons-book-24: SRE Workbook - Monitoring][sre-workbook-monitoring]
129131
- [:octicons-book-24: SRE Workbook - Alerting][sre-workbook-alerting]
130132

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Alerting
2+
3+
<iframe width="560" height="315" src="https://www.youtube.com/embed/CGldVD5wR-g?si=luayvJTiZBsWK24u" title="YouTube video player" frameborder="0" allowfullscreen></iframe>
4+
5+
Alerting

docs/how-to-guides/observability/alerts/grafana-alert.md

Whitespace-only changes.

0 commit comments

Comments
 (0)