Remove unused httpjson agent file from {zeek, apache, windows, aws.cloudtrail, nginx} #14995

vinit-chauhan · 2025-08-20T18:27:01Z

Proposed commit message

httpjson input was removed from these integrations in this PR. However, the agent files were still there with the package.

This PR removes those unused httpjson files.

Checklist

I have reviewed tips for building integrations and this pull request is aligned with them.
I have verified that all data streams collect metrics or logs.
I have added an entry to my package's changelog.yml file.
I have verified that Kibana version constraints are current according to guidelines.
I have verified that any added dashboard complies with Kibana's Dashboard good practices

Author's Checklist

[ ]

How to test this PR locally

Related issues

Closes apache,aws.cloudtrail,nginx,windows,zeek: removed input has agent template remaining #14200

Screenshots

elasticmachine · 2025-08-20T19:20:20Z

Pinging @elastic/integration-experience (Team:Integration-Experience)

elasticmachine · 2025-08-20T19:33:18Z

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

elasticmachine · 2025-08-20T19:33:18Z

Pinging @elastic/security-service-integrations (Team:Security-Service Integrations)

elasticmachine · 2025-08-20T19:33:18Z

Pinging @elastic/sec-windows-platform (Team:Security-Windows Platform)

kgeller · 2025-08-20T20:30:00Z

packages/apache/manifest.yml

-              #    yvgJ38BRsFOtkRuAGSf6ZUwTO8JJRRIFnpUzXflAnGivK9M13D5GEQMmIl6U9Pvk
-              #    sxSmbIUfc2SGJGCJD4I=
-              #    -----END CERTIFICATE-----          
+            default: "#certificate_authorities:\n#  - |\n#    -----BEGIN CERTIFICATE-----\n#    MIIDCjCCAfKgAwIBAgITJ706Mu2wJlKckpIvkWxEHvEyijANBgkqhkiG9w0BAQsF\n#    ADAUMRIwEAYDVQQDDAlsb2NhbGhvc3QwIBcNMTkwNzIyMTkyOTA0WhgPMjExOTA2\n#    MjgxOTI5MDRaMBQxEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEB\n#    BQADggEPADCCAQoCggEBANce58Y/JykI58iyOXpxGfw0/gMvF0hUQAcUrSMxEO6n\n#    fZRA49b4OV4SwWmA3395uL2eB2NB8y8qdQ9muXUdPBWE4l9rMZ6gmfu90N5B5uEl\n#    94NcfBfYOKi1fJQ9i7WKhTjlRkMCgBkWPkUokvBZFRt8RtF7zI77BSEorHGQCk9t\n#    /D7BS0GJyfVEhftbWcFEAG3VRcoMhF7kUzYwp+qESoriFRYLeDWv68ZOvG7eoWnP\n#    PsvZStEVEimjvK5NSESEQa9xWyJOmlOKXhkdymtcUd/nXnx6UTCFgnkgzSdTWV41\n#    CI6B6aJ9svCTI2QuoIq2HxX/ix7OvW1huVmcyHVxyUECAwEAAaNTMFEwHQYDVR0O\n#    BBYEFPwN1OceFGm9v6ux8G+DZ3TUDYxqMB8GA1UdIwQYMBaAFPwN1OceFGm9v6ux\n#    8G+DZ3TUDYxqMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAG5D\n#    874A4YI7YUwOVsVAdbWtgp1d0zKcPRR+r2OdSbTAV5/gcS3jgBJ3i1BN34JuDVFw\n#    3DeJSYT3nxy2Y56lLnxDeF8CUTUtVQx3CuGkRg1ouGAHpO/6OqOhwLLorEmxi7tA\n#    H2O8mtT0poX5AnOAhzVy7QW0D/k4WaoLyckM5hUa6RtvgvLxOwA0U+VGurCDoctu\n#    8F4QOgTAWyh8EZIwaKCliFRSynDpv3JTUwtfZkxo6K6nce1RhCWFAsMvDZL8Dgc0\n#    yvgJ38BRsFOtkRuAGSf6ZUwTO8JJRRIFnpUzXflAnGivK9M13D5GEQMmIl6U9Pvk\n#    sxSmbIUfc2SGJGCJD4I=\n#    -----END CERTIFICATE-----          \n"


Was there a reason for this formatting change?

I think elastic-package format triggered this change.
Let me revert it back.

This happens when there is trailing whitespace on lines. If it is removed, elastic-package format should leave it alone.

You can see that this is the case in the final line of the cert, where -----END CERTIFICATE----- has additional spaces due to terminal copy/paste.

muthu-mps

The enable_request_tracer is specific to httpjson which exists here. This is applicable for the AWS and Nginx integration too. Can this parameter removed from test_config? WDYT?

efd6 · 2025-08-21T07:12:55Z

The enable_request_tracer is specific to httpjson which exists here. This is applicable for the AWS and Nginx integration too. Can this parameter removed from test_config? WDYT?

Yeah, that should be removed.

efd6 · 2025-08-21T07:07:52Z

packages/apache/manifest.yml

@@ -91,7 +91,7 @@ policy_templates:
              #    8F4QOgTAWyh8EZIwaKCliFRSynDpv3JTUwtfZkxo6K6nce1RhCWFAsMvDZL8Dgc0
              #    yvgJ38BRsFOtkRuAGSf6ZUwTO8JJRRIFnpUzXflAnGivK9M13D5GEQMmIl6U9Pvk
              #    sxSmbIUfc2SGJGCJD4I=
-              #    -----END CERTIFICATE-----          
+              #    -----END CERTIFICATE-----   


Suggested change

# -----END CERTIFICATE-----

# -----END CERTIFICATE-----

…plate

elastic-vault-github-plugin-prod · 2025-08-21T15:59:02Z

🚀 Benchmarks report

To see the full report comment with /test benchmark fullreport

elasticmachine · 2025-08-21T15:59:40Z

💚 Build Succeeded

Buildkite Build
Commit: 2c3df22

History

💚 Build #30257 succeeded 6f9b09f
💚 Build #30254 succeeded f8ee67c

cc @vinit-chauhan

elastic-sonarqube · 2025-08-21T15:59:45Z

Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
83.3% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube

efd6

LGTM for cert fix.

gizas · 2025-08-22T13:14:56Z

packages/nginx/data_stream/access/_dev/test/system/test-default-config.yml

@@ -3,4 +3,3 @@ data_stream:
  vars:
    paths:
      - "{{SERVICE_LOGS_DIR}}/access.log*"
-    enable_request_tracer: true


Why is this removed? Was only for httpjson?

Yes, this is httpjson specific, and used for system tests.

elastic-vault-github-plugin-prod · 2025-08-25T13:26:33Z

Package apache - 2.1.1 containing this change is available at https://epr.elastic.co/package/apache/2.1.1/

elastic-vault-github-plugin-prod · 2025-08-25T13:26:34Z

Package aws - 3.14.2 containing this change is available at https://epr.elastic.co/package/aws/3.14.2/

elastic-vault-github-plugin-prod · 2025-08-25T13:26:35Z

Package nginx - 2.3.2 containing this change is available at https://epr.elastic.co/package/nginx/2.3.2/

elastic-vault-github-plugin-prod · 2025-08-25T13:26:36Z

Package windows - 3.1.2 containing this change is available at https://epr.elastic.co/package/windows/3.1.2/

elastic-vault-github-plugin-prod · 2025-08-25T13:26:37Z

Package zeek - 3.0.2 containing this change is available at https://epr.elastic.co/package/zeek/3.0.2/

vinit-chauhan added 4 commits August 19, 2025 13:26

remove httpjson agent files

584b136

remove httpjson files from {apache,aws.cloudtail,nginx,windows}

ded7fdb

added changelog entry

da417dd

Merge branch 'main' into remove_httpjson_template

f8ee67c

vinit-chauhan added the bugfix Pull request that fixes a bug issue label Aug 20, 2025

vinit-chauhan marked this pull request as ready for review August 20, 2025 19:14

vinit-chauhan requested review from a team as code owners August 20, 2025 19:14

vinit-chauhan requested review from khushijain21 and andrzej-stencel August 20, 2025 19:14

vinit-chauhan self-assigned this Aug 20, 2025

qcorporation added the Team:Integration-Experience Security Integrations Integration Experience [elastic/integration-experience] label Aug 20, 2025

kgeller reviewed Aug 20, 2025

View reviewed changes

revert formating in example ssl config

6f9b09f

mjwolf approved these changes Aug 20, 2025

View reviewed changes

muthu-mps reviewed Aug 21, 2025

View reviewed changes

efd6 reviewed Aug 21, 2025

View reviewed changes

vinit-chauhan added 3 commits August 21, 2025 09:39

Merge remote-tracking branch 'upstream/main' into remove_httpjson_tem…

869dc83

…plate

remove tracer configs

8babb7b

remove trailing white space from yml

2c3df22

vinit-chauhan requested review from muthu-mps and efd6 August 21, 2025 14:18

efd6 approved these changes Aug 21, 2025

View reviewed changes

muthu-mps approved these changes Aug 22, 2025

View reviewed changes

muthu-mps changed the title ~~Remove unused httpjson agent file from {zeek, apache, system, windows, aws.cloudtrail, nginx}~~ Remove unused httpjson agent file from {zeek, apache, windows, aws.cloudtrail, nginx} Aug 22, 2025

andrzej-stencel approved these changes Aug 22, 2025

View reviewed changes

nfritts approved these changes Aug 22, 2025

View reviewed changes

gizas reviewed Aug 22, 2025

View reviewed changes

gizas approved these changes Aug 25, 2025

View reviewed changes

vinit-chauhan merged commit 342925a into elastic:main Aug 25, 2025
9 checks passed

Remove unused httpjson agent file from {zeek, apache, windows, aws.cloudtrail, nginx} #14995

Remove unused httpjson agent file from {zeek, apache, windows, aws.cloudtrail, nginx} #14995

Conversation

vinit-chauhan commented Aug 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Proposed commit message

Checklist

Author's Checklist

How to test this PR locally

Related issues

Screenshots

Uh oh!

elasticmachine commented Aug 20, 2025

Uh oh!

elasticmachine commented Aug 20, 2025

Uh oh!

elasticmachine commented Aug 20, 2025

Uh oh!

elasticmachine commented Aug 20, 2025

Uh oh!

kgeller Aug 20, 2025

Choose a reason for hiding this comment

Uh oh!

vinit-chauhan Aug 20, 2025

Choose a reason for hiding this comment

Uh oh!

efd6 Aug 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

muthu-mps left a comment

Choose a reason for hiding this comment

Uh oh!

efd6 commented Aug 21, 2025

Uh oh!

efd6 Aug 21, 2025

Choose a reason for hiding this comment

Uh oh!

elastic-vault-github-plugin-prod bot commented Aug 21, 2025

🚀 Benchmarks report

Uh oh!

elasticmachine commented Aug 21, 2025

💚 Build Succeeded

History

Uh oh!

elastic-sonarqube bot commented Aug 21, 2025

Quality Gate passed

Uh oh!

efd6 left a comment

Choose a reason for hiding this comment

Uh oh!

gizas Aug 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vinit-chauhan Aug 22, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

elastic-vault-github-plugin-prod bot commented Aug 25, 2025

Uh oh!

elastic-vault-github-plugin-prod bot commented Aug 25, 2025

Uh oh!

elastic-vault-github-plugin-prod bot commented Aug 25, 2025

Uh oh!

elastic-vault-github-plugin-prod bot commented Aug 25, 2025

Uh oh!

elastic-vault-github-plugin-prod bot commented Aug 25, 2025

Uh oh!

Uh oh!

vinit-chauhan commented Aug 20, 2025 •

edited

Loading

efd6 Aug 20, 2025 •

edited

Loading

gizas Aug 22, 2025 •

edited

Loading