Merge pull request #289 from ckavili/main

🐈 add some descriptions🐈
rht-labs · Jun 21, 2024 · 0686993 · 0686993
2 parents 3f7c566 + 95258c7
commit 0686993
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/docs/4-return-of-the-monitoring/2-create-alerts.md b/docs/4-return-of-the-monitoring/2-create-alerts.md
@@ -1,6 +1,7 @@
 ## Alerting and Notifications
 
-> OpenShift's built in alerts.... blah
+> OpenShift has alerting and metric gathering built into the platform using the prometheus stack. It collects all the information from each node in the cluster to give overall health of things like memory and disk usage. To enable user workload monitoring a small change needs to be made to the operator. With this in place, app dev teams can hook into the built in monitoring stack by placing a `ServiceMonitor` Custom Resource with a reference to where the prometheus endpoints
+
 ### Platform Alerts
 
 1. The Pet Battle API and UI charts both have one basic `rule` for firing off an alert. If you open up the `/projects/pet-battle-api/chart/templates/prometheusrule.yaml` you'll see one configured to alert when a pod is not available for one minute. The alert rules are written in PromQL.

diff --git a/docs/4-return-of-the-monitoring/3-logging.md b/docs/4-return-of-the-monitoring/3-logging.md
@@ -1,6 +1,6 @@
 ## Aggregated Logging
 
-> OpenShift's built in logging .... Something something installed operator before hand. Very memory intensive, logging can be deployed to the infra plane though...
+> OpenShift's built in logging by default collects all output from all containers that are logging to system out. This means no logging needs to be configured explicitly in the application. Logs are collected using Vector collector or the legacy Fluentd collector then popped into Elastic (or LokiStack) where they are indexed in a timeseries as JSON. You can use a UI component to view a visual representation of your log data. The UI provides a graphical interface to search, query, and view stored logs. The OpenShift Container Platform web console UI is provided by enabling the OpenShift Container Platform console plugin. Or you can choose to use Kibana which the graphical tool on top of Elastic to run queries and search the logs.
 
 1. Observe logs from any given container: