Skip to content

Commit d117095

Browse files
authored
Merge branch 'main' into leemthompo/deploy-manage-security-overview
2 parents 8c136c9 + 7d2973c commit d117095

File tree

9 files changed

+26
-9
lines changed

9 files changed

+26
-9
lines changed

deploy-manage/deploy/cloud-on-k8s/troubleshooting-beats.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ When `kubectl` is used to modify a resource, it calculates the diff between the
2525

2626
If you have configured a Beat to run as a `Deployment` and you are using a `hostPath` volume as the Beats data directory, you might encounter an error similar to the following:
2727

28-
```shell script
28+
```shell
2929
ERROR instance/beat.go:958 Exiting: data path already locked by another beat. Please make sure that multiple beats are not sharing the same data path (path.data).
3030
```
3131

deploy-manage/license/manage-your-license-in-eck.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ data:
8484
8585
You can easily create this secret using `kubectl` built-in support for secrets. Note that it must be in the same namespace as the operator:
8686

87-
```shell script
87+
```shell
8888
kubectl create secret generic eck-license --from-file=my-license-file.json -n elastic-system
8989
kubectl label secret eck-license "license.k8s.elastic.co/scope"=operator -n elastic-system
9090
```

reference/glossary/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ $$$glossary-no-op$$$ no-op
537537

538538
$$$glossary-node$$$ node
539539
: 1. A single {{es}} server. One or more nodes can form a [cluster](/reference/glossary/index.md#glossary-cluster). See [Clusters, nodes, and shards](/deploy-manage/production-guidance/getting-ready-for-production-elasticsearch.md).
540-
2. In {{eck}}, it can refer to either an [Elasticsearch Node](https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-node.md) or a [Kubernetes Node](https://kubernetes.io/docs/concepts/architecture/nodes/) depending on the context. ECK maps an Elasticsearch node to a Kubernetes Pod which can get scheduled onto any available Kubernetes node that can satisfy the [resource requirements](/deploy-manage/deploy/cloud-on-k8s/manage-compute-resources.md) and [node constraints](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/) defined in the [pod template](/deploy-manage/deploy/cloud-on-k8s/customize-pods.md).
540+
2. In {{eck}}, it can refer to either an [Elasticsearch Node](https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-node.html) or a [Kubernetes Node](https://kubernetes.io/docs/concepts/architecture/nodes/) depending on the context. ECK maps an Elasticsearch node to a Kubernetes Pod which can get scheduled onto any available Kubernetes node that can satisfy the [resource requirements](/deploy-manage/deploy/cloud-on-k8s/manage-compute-resources.md) and [node constraints](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/) defined in the [pod template](/deploy-manage/deploy/cloud-on-k8s/customize-pods.md).
541541

542542
$$$NodeSet$$$NodeSet
543543
: A set of Elasticsearch nodes that share the same Elasticsearch configuration and a Kubernetes Pod template. Multiple NodeSets can be defined in the Elasticsearch CRD to achieve a cluster topology consisting of groups of Elasticsearch nodes with different node roles, resource requirements and hardware configurations (Kubernetes node constraints).

reference/ingestion-tools/fleet/elastic-agent-inputs-list.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ When you [configure inputs](/reference/ingestion-tools/fleet/elastic-agent-input
4141
| `haproxy/metrics` | Collects stats from [HAProxy](http://www.haproxy.org/). It supports collection from TCP sockets, UNIX sockets, or HTTP with or without basic authentication. | [HAProxy module](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-overview.md) ({{metricbeat}} docs) |
4242
| `http/metrics` | Used to call arbitrary HTTP endpoints for which a dedicated Metricbeat module is not available. | [HTTP module](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-module-http.md) ({{metricbeat}} docs) |
4343
| `iis/metrics` | Periodically retrieve IIS web server related metrics. | [IIS module](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-module-iis.md) ({{metricbeat}} docs) |
44-
| `jolokia/metrics` | Collects metrics from [Jolokia agents](https://jolokia.org/reference/html/agents.md) running on a target JMX server or dedicated proxy server. | [Jolokia module](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-module-jolokia.md) ({{metricbeat}} docs) |
44+
| `jolokia/metrics` | Collects metrics from [Jolokia agents](https://jolokia.org/reference/html/agents.html) running on a target JMX server or dedicated proxy server. | [Jolokia module](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-module-jolokia.md) ({{metricbeat}} docs) |
4545
| `kafka/metrics` | Collects metrics from the [Apache Kafka](https://kafka.apache.org/intro) event streaming platform. | [Kafka module](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-module-kafka.md) ({{metricbeat}} docs) |
4646
| `kibana/metrics` | Collects metrics about {{Kibana}}. | [{{kib}} module](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-module-kibana.md) ({{metricbeat}} docs) |
4747
| `kubernetes/metrics` | As one of the main pieces provided for Kubernetes monitoring, this module is capable of fetching metrics from several components. | [Kubernetes module](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-module-kubernetes.md) ({{metricbeat}} docs) |
@@ -56,15 +56,15 @@ When you [configure inputs](/reference/ingestion-tools/fleet/elastic-agent-input
5656
| `oracle/metrics` | The [Oracle](https://www.oracle.com/) module for Metricbeat. It is under active development with feedback from the community. A single Metricset for Tablespace monitoring is added so the community can start gathering metrics from their nodes and contributing to the module. | [Oracle module](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-module-oracle.md) ({{metricbeat}} docs) |
5757
| `postgresql/metrics` | Periodically fetches metrics from [PostgreSQL](https://www.postgresql.org/) servers. | [PostgresSQL module](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-module-postgresql.md) ({{metricbeat}} docs) |
5858
| `prometheus/metrics` | Periodically scrapes metrics from [Prometheus exporters](https://prometheus.io/docs/instrumenting/exporters/). | [Prometheus module](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-module-prometheus.md) ({{metricbeat}} docs) |
59-
| `rabbitmq/metrics` | Uses the [HTTP API](http://www.rabbitmq.com/management.md) created by the management plugin to collect RabbitMQ metrics. | [RabbitMQ module](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-module-rabbitmq.md) ({{metricbeat}} docs) |
59+
| `rabbitmq/metrics` | Uses the [HTTP API](http://www.rabbitmq.com/management.html) created by the management plugin to collect RabbitMQ metrics. | [RabbitMQ module](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-module-rabbitmq.md) ({{metricbeat}} docs) |
6060
| `redis/metrics` | Periodically fetches metrics from [Redis](http://redis.io/) servers. | [Redis module](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-module-redis.md) ({{metricbeat}} docs) |
6161
| `sql/metrics` | Allows you to execute custom queries against an SQL database and store the results in {{es}}. | [SQL module](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-module-sql.md) ({{metricbeat}} docs) |
6262
| `stan/metrics` | Uses [STAN monitoring server APIs](https://github.com/nats-io/nats-streaming-server/blob/master/server/monitor.go) to collect metrics. | [Stan module](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-module-stan.md) ({{metricbeat}} docs) |
6363
| `statsd/metrics` | Spawns a UDP server and listens for metrics in StatsD compatible format. | [Statsd module](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-module-statsd.md) ({{metricbeat}} docs) |
6464
| `syncgateway/metrics` | [beta] Monitor a Sync Gateway instance by using its REST API. | [SyncGateway module](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-module-syncgateway.md) ({{metricbeat}} docs) |
6565
| `system/metrics` | Allows you to monitor your server metrics, including CPU, load, memory, network, processes, sockets, filesystem, fsstat, uptime, and more. | [System module](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-module-system.md) ({{metricbeat}} docs) |
6666
| `traefik/metrics` | Periodically fetches metrics from a [Traefik](https://traefik.io/) instance. | [Traefik module](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-module-traefik.md) ({{metricbeat}} docs) |
67-
| `uwsgi/metrics` | By default, collects the uWSGI stats metricset, using [StatsServer](https://uwsgi-docs.readthedocs.io/en/latest/StatsServer.md). | [uWSGI module](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-module-uwsgi.md) ({{metricbeat}} docs) |
67+
| `uwsgi/metrics` | By default, collects the uWSGI stats metricset, using [StatsServer](https://uwsgi-docs.readthedocs.io/en/latest/StatsServer.html). | [uWSGI module](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-module-uwsgi.md) ({{metricbeat}} docs) |
6868
| `vsphere/metrics` | Uses the [Govmomi](https://github.com/vmware/govmomi) library to collect metrics from any Vmware SDK URL (ESXi/VCenter). | [vSphere module](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-module-vsphere.md) ({{metricbeat}} docs) |
6969
| `windows/metrics` | Collects metrics from Windows systems. | [Windows module](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-module-windows.md) ({{metricbeat}} docs) |
7070
| `zookeeper/metrics` | Fetches statistics from the ZooKeeper service. | [ZooKeeper module](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-module-zookeeper.md) ({{metricbeat}} docs) |

troubleshoot/security.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ navigation_title: "Security"
33
mapped_pages:
44
- https://www.elastic.co/guide/en/security/current/troubleshooting-ov.html
55
- https://www.elastic.co/guide/en/serverless/current/security-troubleshooting-ov.html
6+
applies_to:
7+
stack: all
8+
serverless:
9+
security: all
610
---
711

812
# Troubleshoot Security [troubleshooting-ov]

troubleshoot/security/agentless-integrations.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
mapped_pages:
33
- https://www.elastic.co/guide/en/security/current/agentless-integrations.html
44
- https://www.elastic.co/guide/en/serverless/current/agentless-integration-troubleshooting.html
5+
applies_to:
6+
stack: all
7+
serverless:
8+
security: all
59
---
610

711
# Agentless integrations FAQ [agentless-integration-troubleshooting]

troubleshoot/security/detection-rules.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ mapped_pages:
55
- https://www.elastic.co/guide/en/serverless/current/security-ts-detection-rules.html
66
- https://www.elastic.co/guide/en/security/current/alerts-ui-monitor.html#troubleshoot-signals
77
- https://www.elastic.co/guide/en/serverless/current/security-alerts-ui-monitor.html#troubleshoot-signals
8+
applies_to:
9+
stack: all
10+
serverless:
11+
security: all
812
---
913

1014
# Troubleshoot detection rules [ts-detection-rules]

troubleshoot/security/elastic-defend.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ navigation_title: "{{elastic-defend}}"
33
mapped_pages:
44
- https://www.elastic.co/guide/en/security/current/ts-management.html
55
- https://www.elastic.co/guide/en/serverless/current/security-troubleshoot-endpoints.html
6-
applies:
7-
serverless: all
8-
hosted: all
6+
applies_to:
7+
stack: all
8+
serverless:
9+
security: all
910
---
1011

1112
# Troubleshoot {{elastic-defend}} [ts-management]

troubleshoot/security/indicators-of-compromise.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ navigation_title: "Indicators of compromise"
33
mapped_pages:
44
- https://www.elastic.co/guide/en/security/current/indicators-of-compromise.html
55
- https://www.elastic.co/guide/en/serverless/current/security-indicators-of-compromise.html
6+
applies_to:
7+
stack: all
8+
serverless:
9+
security: all
610
---
711

812

0 commit comments

Comments
 (0)