Skip to content

Commit 9f8a65a

Browse files
author
kaiyan-sheng
authored
Merge branch 'main' into platformlogs
2 parents 69651d6 + 1b0d598 commit 9f8a65a

10 files changed

Lines changed: 2018 additions & 0 deletions

File tree

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
/packages/akamai @elastic/security-service-integrations
1818
/packages/amazon_security_lake @elastic/security-service-integrations
1919
/packages/apache @elastic/obs-infraobs-integrations
20+
/packages/apache_otel @elastic/obs-infraobs-integrations
2021
/packages/apache_spark @elastic/obs-infraobs-integrations
2122
/packages/apache_tomcat @elastic/obs-infraobs-integrations
2223
/packages/apm @elastic/obs-ds-intake-services

.github/ISSUE_TEMPLATE/integration_bug.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ body:
131131
- Cybereason [cybereason]
132132
- Cybersixgill [ti_cybersixgill]
133133
- CylanceProtect Logs (Deprecated) [cylance]
134+
- Cyware Intel Exchange [ti_cyware_intel_exchange]
134135
- Darktrace [darktrace]
135136
- Data Exfiltration Detection [ded]
136137
- Defend for Containers (Deprecated) [cloud_defend]
@@ -287,6 +288,7 @@ body:
287288
- Proofpoint TAP [proofpoint_tap]
288289
- Pulse Connect Secure [pulse_connect_secure]
289290
- QNAP NAS [qnap_nas]
291+
- Qualys Global AssetView [qualys_gav]
290292
- Qualys VMDR [qualys_vmdr]
291293
- Qualys Web Application Scanning (WAS) [qualys_was]
292294
- RabbitMQ Logs and Metrics [rabbitmq]

.github/ISSUE_TEMPLATE/integration_feature_request.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ body:
131131
- Cybereason [cybereason]
132132
- Cybersixgill [ti_cybersixgill]
133133
- CylanceProtect Logs (Deprecated) [cylance]
134+
- Cyware Intel Exchange [ti_cyware_intel_exchange]
134135
- Darktrace [darktrace]
135136
- Data Exfiltration Detection [ded]
136137
- Defend for Containers (Deprecated) [cloud_defend]
@@ -287,6 +288,7 @@ body:
287288
- Proofpoint TAP [proofpoint_tap]
288289
- Pulse Connect Secure [pulse_connect_secure]
289290
- QNAP NAS [qnap_nas]
291+
- Qualys Global AssetView [qualys_gav]
290292
- Qualys VMDR [qualys_vmdr]
291293
- Qualys Web Application Scanning (WAS) [qualys_was]
292294
- RabbitMQ Logs and Metrics [rabbitmq]

packages/apache_otel/LICENSE.txt

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
Elastic License 2.0
2+
3+
URL: https://www.elastic.co/licensing/elastic-license
4+
5+
## Acceptance
6+
7+
By using the software, you agree to all of the terms and conditions below.
8+
9+
## Copyright License
10+
11+
The licensor grants you a non-exclusive, royalty-free, worldwide,
12+
non-sublicensable, non-transferable license to use, copy, distribute, make
13+
available, and prepare derivative works of the software, in each case subject to
14+
the limitations and conditions below.
15+
16+
## Limitations
17+
18+
You may not provide the software to third parties as a hosted or managed
19+
service, where the service provides users with access to any substantial set of
20+
the features or functionality of the software.
21+
22+
You may not move, change, disable, or circumvent the license key functionality
23+
in the software, and you may not remove or obscure any functionality in the
24+
software that is protected by the license key.
25+
26+
You may not alter, remove, or obscure any licensing, copyright, or other notices
27+
of the licensor in the software. Any use of the licensor’s trademarks is subject
28+
to applicable law.
29+
30+
## Patents
31+
32+
The licensor grants you a license, under any patent claims the licensor can
33+
license, or becomes able to license, to make, have made, use, sell, offer for
34+
sale, import and have imported the software, in each case subject to the
35+
limitations and conditions in this license. This license does not cover any
36+
patent claims that you cause to be infringed by modifications or additions to
37+
the software. If you or your company make any written claim that the software
38+
infringes or contributes to infringement of any patent, your patent license for
39+
the software granted under these terms ends immediately. If your company makes
40+
such a claim, your patent license ends immediately for work on behalf of your
41+
company.
42+
43+
## Notices
44+
45+
You must ensure that anyone who gets a copy of any part of the software from you
46+
also gets a copy of these terms.
47+
48+
If you modify the software, you must include in any modified copies of the
49+
software prominent notices stating that you have modified the software.
50+
51+
## No Other Rights
52+
53+
These terms do not imply any licenses other than those expressly granted in
54+
these terms.
55+
56+
## Termination
57+
58+
If you use the software in violation of these terms, such use is not licensed,
59+
and your licenses will automatically terminate. If the licensor provides you
60+
with a notice of your violation, and you cease all violation of this license no
61+
later than 30 days after you receive that notice, your licenses will be
62+
reinstated retroactively. However, if you violate these terms after such
63+
reinstatement, any additional violation of these terms will cause your licenses
64+
to terminate automatically and permanently.
65+
66+
## No Liability
67+
68+
*As far as the law allows, the software comes as is, without any warranty or
69+
condition, and the licensor will not be liable to you for any damages arising
70+
out of these terms or the use or nature of the software, under any kind of
71+
legal claim.*
72+
73+
## Definitions
74+
75+
The **licensor** is the entity offering these terms, and the **software** is the
76+
software the licensor makes available under these terms, including any portion
77+
of it.
78+
79+
**you** refers to the individual or entity agreeing to these terms.
80+
81+
**your company** is any legal entity, sole proprietorship, or other kind of
82+
organization that you work for, plus all organizations that have control over,
83+
are under the control of, or are under common control with that
84+
organization. **control** means ownership of substantially all the assets of an
85+
entity, or the power to direct its management and policies by vote, contract, or
86+
otherwise. Control can be direct or indirect.
87+
88+
**your licenses** are all the licenses granted to you for the software under
89+
these terms.
90+
91+
**use** means anything you do with the software requiring one of your licenses.
92+
93+
**trademark** means trademarks, service marks, and similar rights.

packages/apache_otel/changelog.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# newer versions go on top
2+
- version: "0.1.0"
3+
changes:
4+
- description: Initial draft of the Apache OTel content package
5+
type: enhancement
6+
link: https://github.com/elastic/integrations/pull/14838
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# Apache metrics from OpenTelemetry Collector
2+
3+
The Apache OTEL integration fetches metrics from [Apache](https://httpd.apache.org/) servers.
4+
5+
Use the Apache OTEL integration to collect performance metrics from your Apache servers. Then visualize that data in Kibana, create alerts to notify you if something goes wrong, and reference metrics when troubleshooting performance issues. Apache server exposes metrics through its [status module](http://httpd.apache.org/docs/current/mod/mod_status.html), `mod_status`.
6+
7+
8+
## Requirements
9+
10+
You need Elasticsearch for storing and searching your data and Kibana for visualizing and managing it. You can use our hosted Elasticsearch Service on Elastic Cloud, which is recommended, or self-manage the Elastic Stack on your own hardware.
11+
12+
1. Compatibility and supported versions: This integration is compatible with systems running the upstream OpenTelemetry Collector and Apache server with the `mod_status` module enabled. This integration has been tested with OTEL collector version [v0.129.0](https://github.com/open-telemetry/opentelemetry-collector/tree/v0.129.0), and Apache version 2.4.59.
13+
14+
2. Permissions required: The collector requires access to the Apache server-status endpoint (for example, http://localhost:80/server-status). When running the collector, make sure you have the appropriate permissions to access this endpoint. If that link doesn't work, you may need to enable mod_status in your Apache configuration file.
15+
16+
3. Apache configuration: You'll need to update the block (either in your status module's config file or main Apache config file) that starts with `<Location /server-status>` to specify which IP addresses should have access to the status page. In the example below, we are allowing access from localhost, as well as the IP address x.x.x.x.
17+
```
18+
<Location /server-status>
19+
SetHandler server-status
20+
Require local
21+
Require ip x.x.x.x
22+
</Location>
23+
```
24+
25+
4. Finding the Apache config: On Debian-based systems, the status module’s configuration file is typically located at `/etc/apache2/mods-enabled/status.conf`. On other UNIX-like platforms (such as Red Hat–based systems or macOS), you’ll usually find the main configuration file at one of the following paths: `/etc/apache2/apache2.conf`, `/etc/httpd/conf/httpd.conf`, or `/etc/apache2/httpd.conf`.
26+
27+
Within the main configuration file, locate the following line and make sure it is uncommented:
28+
29+
```
30+
LoadModule status_module libexec/apache2/mod_status.so
31+
```
32+
33+
## Setup
34+
35+
1. Make sure the `mod_status` module is enabled and the server-status endpoint is accessible.
36+
37+
2. Install and configure the EDOT Collector or upstream Collector to export metrics to Elasticsearch, as shown in the following example:
38+
39+
```
40+
receivers:
41+
apache:
42+
endpoint: http://<hostname>/server-status
43+
collection_interval: 60s
44+
exporters:
45+
debug:
46+
verbosity: detailed
47+
elasticsearch/otel:
48+
endpoint: https://localhost:9200
49+
user: <userid>
50+
password: <password>
51+
mapping:
52+
mode: otel
53+
metrics_dynamic_index:
54+
enabled: true
55+
56+
57+
service:
58+
pipelines:
59+
metrics:
60+
receivers: [apache]
61+
exporters: [debug, elasticsearch/otel]
62+
```
63+
64+
Use this configuration to run the collector.
65+
66+
## Metrics reference
67+
68+
### Apache metrics
69+
70+
For a complete list of all available metrics and their detailed descriptions, refer to the [Apache Receiver documentation](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/receiver/apachereceiver/documentation.md) in the upstream OpenTelemetry Collector repository.
71+
72+
73+
74+
75+
76+
400 KB
Loading

0 commit comments

Comments
 (0)