Skip to content

Commit 8df464a

Browse files
moxarth-rathodmoxarth-rathod
committed
Resolve merge conflicts
2 parents 9e8e4f1 + 1926488 commit 8df464a

File tree

684 files changed

+8918
-4366
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

684 files changed

+8918
-4366
lines changed

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,7 @@
354354
/packages/netscout @elastic/integration-experience
355355
/packages/netskope @elastic/security-service-integrations
356356
/packages/network_traffic @elastic/sec-linux-platform
357+
/packages/nextron_thor @elastic/security-service-integrations
357358
/packages/nginx @elastic/obs-infraobs-integrations
358359
/packages/nginx_ingress_controller @elastic/obs-ds-hosted-services
359360
/packages/nginx_ingress_controller_otel @elastic/obs-infraobs-integrations
@@ -542,3 +543,4 @@
542543
/packages/zoom @elastic/security-service-integrations
543544
/packages/zscaler_zia @elastic/security-service-integrations
544545
/packages/zscaler_zpa @elastic/security-service-integrations
546+
/packages/otel_rum_dashboards @elastic/apm-agent-rum

‎.github/ISSUE_TEMPLATE/integration_bug.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ body:
234234
- Keeper Security [keeper_security_siem_integration]
235235
- Keycloak [keycloak]
236236
- Kibana [kibana]
237+
- Kubelet Stats OpenTelemetry Input [kubeletstats_input_otel]
237238
- Kubernetes OpenTelemetry Assets [kubernetes_otel]
238239
- Kubernetes [kubernetes]
239240
- LastPass [lastpass]
@@ -332,6 +333,7 @@ body:
332333
- Redis Enterprise [redisenterprise]
333334
- Redis [redis]
334335
- Rubrik RSC Metrics [rubrik]
336+
- RUM OpenTelemetry Assets [otel_rum_dashboards]
335337
- Sailpoint Identity Security Cloud [sailpoint_identity_sc]
336338
- Salesforce [salesforce]
337339
- Security AI Prompts [security_ai_prompts]
@@ -353,6 +355,7 @@ body:
353355
- Squid Proxy [squid]
354356
- STAN [stan]
355357
- StatsD Input [statsd_input]
358+
- StatsD OpenTelemetry Input Package [statsd_input_otel]
356359
- StormShield SNS [stormshield]
357360
- Sublime Security [sublime_security]
358361
- Suricata [suricata]

‎.github/ISSUE_TEMPLATE/integration_feature_request.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ body:
234234
- Keeper Security [keeper_security_siem_integration]
235235
- Keycloak [keycloak]
236236
- Kibana [kibana]
237+
- Kubelet Stats OpenTelemetry Input [kubeletstats_input_otel]
237238
- Kubernetes OpenTelemetry Assets [kubernetes_otel]
238239
- Kubernetes [kubernetes]
239240
- LastPass [lastpass]
@@ -332,6 +333,7 @@ body:
332333
- Redis Enterprise [redisenterprise]
333334
- Redis [redis]
334335
- Rubrik RSC Metrics [rubrik]
336+
- RUM OpenTelemetry Assets [otel_rum_dashboards]
335337
- Sailpoint Identity Security Cloud [sailpoint_identity_sc]
336338
- Salesforce [salesforce]
337339
- Security AI Prompts [security_ai_prompts]
@@ -353,6 +355,7 @@ body:
353355
- Squid Proxy [squid]
354356
- STAN [stan]
355357
- StatsD Input [statsd_input]
358+
- StatsD OpenTelemetry Input Package [statsd_input_otel]
356359
- StormShield SNS [stormshield]
357360
- Sublime Security [sublime_security]
358361
- Suricata [suricata]

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ The text here and the PR title will be subject to the PR review process.
2929

3030
## Checklist
3131

32-
- [ ] I have reviewed [tips for building integrations](https://github.com/elastic/integrations/blob/main/docs/tips_for_building_integrations.md) and this pull request is aligned with them.
32+
- [ ] I have reviewed [tips for building integrations](https://www.elastic.co/docs/extend/integrations/tips-for-building) and this pull request is aligned with them.
3333
- [ ] I have verified that all data streams collect metrics or logs.
3434
- [ ] I have added an entry to my package's `changelog.yml` file.
3535
- [ ] I have verified that Kibana version constraints are current according to [guidelines](https://github.com/elastic/elastic-package/blob/master/docs/howto/stack_version_support.md#when-to-update-the-condition).

‎dev/codeowners/codeowners.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ const DefaultCodeownersPath = ".github/CODEOWNERS"
2020
func Check() error {
2121
codeowners, err := readGithubOwners(DefaultCodeownersPath)
2222
if err != nil {
23-
return err
23+
return fmt.Errorf("error reading %s: %w", DefaultCodeownersPath, err)
2424
}
2525
const packagesDir = "packages"
2626
if err := validatePackages(codeowners, packagesDir); err != nil {
27-
return err
27+
return fmt.Errorf("error validating packages in directory '%s': %w", packagesDir, err)
2828
}
2929

3030
return nil
@@ -65,7 +65,7 @@ type githubOwners struct {
6565
func validatePackages(codeowners *githubOwners, packagesDir string) error {
6666
packageDirEntries, err := os.ReadDir(packagesDir)
6767
if err != nil {
68-
return err
68+
return fmt.Errorf("error reading directory '%s': %w", packagesDir, err)
6969
}
7070

7171
if len(packageDirEntries) == 0 {
@@ -83,12 +83,12 @@ func validatePackages(codeowners *githubOwners, packagesDir string) error {
8383
packageManifestPath := path.Join(packagePath, "manifest.yml")
8484
err = codeowners.checkManifest(packageManifestPath)
8585
if err != nil {
86-
return err
86+
return fmt.Errorf("error checking manifest '%s': %w", packageManifestPath, err)
8787
}
8888

8989
err = codeowners.checkDataStreams(packagePath)
9090
if err != nil {
91-
return err
91+
return fmt.Errorf("error checking data streams from '%s': %w", packagePath, err)
9292
}
9393

9494
}

‎docs/extend/index.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ Begin by understanding what is an [integration](./what-is-an-integration.md).
1515

1616
Dive deep into the technical aspects of building integrations with Elastic products. Our [Building Integrations](./build-new-integration.md) guide covers everything from architecture and design principles to coding best practices and sample projects.
1717

18+
## OTel Input Packages
19+
20+
Learn how to create [OTel Input Packages](./otel-input-packages.md) that configure OpenTelemetry Collector receivers within EDOT (Elastic Distribution of OpenTelemetry).
21+
1822
## Testing and Validation
1923

2024
Ensure your integrations work seamlessly by following our [Testing and Validation](./testing-validation.md) guidelines. Learn about different testing methodologies, tools, and techniques to validate your integration's performance and reliability.

‎docs/extend/integration-definitions.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ Unlike integrations, content packages do not include data streams or Agent polic
3636

3737
An input package is a type of package that exposes the raw configuration of an Elastic Agent input for custom use cases. Unlike integrations that provide pre-configured data collection for specific technologies, input packages allow users to configure inputs directly for their unique requirements.
3838

39+
A special type of input package is the **OTel Input Package**, which configures OpenTelemetry Collector receivers within EDOT (Elastic Distribution of OpenTelemetry). See [OTel Input Packages](./otel-input-packages.md) for details on creating these packages.
40+
3941

4042
## Data stream [_data_stream]
4143

0 commit comments

Comments
 (0)