summaryrefslogtreecommitdiffstats
path: root/docs/guides
diff options
context:
space:
mode:
authorJoel Hans <joel@netdata.cloud>2020-09-30 06:41:10 -0700
committerGitHub <noreply@github.com>2020-09-30 06:41:10 -0700
commite788b1a8547fcb444ba4cba1adb863457c84d472 (patch)
treee5b607c5409e3c468203e0bb1f08017d0a0dd298 /docs/guides
parentb8713d153df674e97f3da5809a6151b087fdadf6 (diff)
Add documentation for claiming k8s parent pods and Prometheus service discovery (#10001)
* Quick fix to Pi guide * Add claiming instructions * Remove specific number and change sd text * Slight tweaks to sd text * Remove 23 in packaging doc
Diffstat (limited to 'docs/guides')
-rw-r--r--docs/guides/monitor/kubernetes-k8s-netdata.md19
-rw-r--r--docs/guides/monitor/pi-hole-raspberry-pi.md4
2 files changed, 13 insertions, 10 deletions
diff --git a/docs/guides/monitor/kubernetes-k8s-netdata.md b/docs/guides/monitor/kubernetes-k8s-netdata.md
index 18be696a67..097cc13ac9 100644
--- a/docs/guides/monitor/kubernetes-k8s-netdata.md
+++ b/docs/guides/monitor/kubernetes-k8s-netdata.md
@@ -28,11 +28,13 @@ your k8s infrastructure.
- A [Helm chart](https://github.com/netdata/helmchart), which bootstraps a Netdata Agent pod on every node in your
cluster, plus an additional parent pod for storing metrics and managing alarm notifications.
-- A [service discovery plugin](https://github.com/netdata/agent-service-discovery), which discovers and immediately
- monitors 22 different services that might be running inside of your cluster's pods. Service discovery happens
- without manual intervention as pods are created, destroyed, or moved between nodes. [Compatible
- services](https://github.com/netdata/helmchart#service-discovery-and-supported-services) include Nginx, Apache,
- MySQL, CoreDNS, and much more.
+- A [service discovery plugin](https://github.com/netdata/agent-service-discovery), which discovers and creates
+ configuration files for [compatible
+ applications](https://github.com/netdata/helmchart#service-discovery-and-supported-services) and any endpoints
+ covered by our [generic Prometheus
+ collector](https://learn.netdata.cloud/docs/agent/collectors/go.d.plugin/modules/prometheus). With these
+ configuration files, Netdata collects metrics from any compatible applications as they run _inside_ of a pod.
+ Service discovery happens without manual intervention as pods are created, destroyed, or moved between nodes.
- A [Kubelet collector](https://learn.netdata.cloud/docs/agent/collectors/go.d.plugin/modules/k8s_kubelet), which runs
on each node in a k8s cluster to monitor the number of pods/containers, the volume of operations on each container,
and more.
@@ -143,9 +145,10 @@ Thanks to Netdata's service discovery feature, you monitor containerized applica
configuration or manual intervention. Service discovery is like a watchdog for created or deleted pods, recognizing the
service they run based on the image name and port and immediately attempting to apply a logical default configuration.
-Service configuration supports [22
-services](https://github.com/netdata/helmchart#service-discovery-and-supported-services), which are automatically added
-or removed from Netdata as soon as the pods are created or destroyed.
+Service configuration supports [popular
+applications](https://github.com/netdata/helmchart#service-discovery-and-supported-services), plus any endpoints covered
+by our [generic Prometheus collector](https://learn.netdata.cloud/docs/agent/collectors/go.d.plugin/modules/prometheus),
+which are automatically added or removed from Netdata as soon as the pods are created or destroyed.
You can find these service discovery sections near the bottom of the menu. The names for these sections follow a
pattern: the name of the detected service, followed by a string of the module name, pod TUID, service type, port
diff --git a/docs/guides/monitor/pi-hole-raspberry-pi.md b/docs/guides/monitor/pi-hole-raspberry-pi.md
index ce8f255a9f..145f1e9673 100644
--- a/docs/guides/monitor/pi-hole-raspberry-pi.md
+++ b/docs/guides/monitor/pi-hole-raspberry-pi.md
@@ -31,8 +31,8 @@ directly using a keyboard, mouse, and monitor.
Netdata helps you monitor and troubleshoot all kinds of devices and the applications they run, including IoT devices
like the Raspberry Pi and applications like Pi-hole.
-After a two-minute installation and with zero configuration, you'll be able all of Pi-hole's metrics, including the
-volume of queries, connected clients, DNS queries per type, top clients, top blocked domains, and more.
+After a two-minute installation and with zero configuration, you'll be able to seeall of Pi-hole's metrics, including
+the volume of queries, connected clients, DNS queries per type, top clients, top blocked domains, and more.
With Netdata installed, you can also monitor system metrics and any other applications you might be running. By default,
Netdata collects metrics on CPU usage, disk IO, bandwidth, per-application resource usage, and a ton more. With the