Skip to content

Re-enable secrets for packages disabled due to Kibana versions below …#9321

Merged
ritalwar merged 8 commits intoelastic:mainfrom
ritalwar:re-enable-secret-below-8.10
Mar 13, 2024
Merged

Re-enable secrets for packages disabled due to Kibana versions below …#9321
ritalwar merged 8 commits intoelastic:mainfrom
ritalwar:re-enable-secret-below-8.10

Conversation

@ritalwar
Copy link
Copy Markdown
Contributor

@ritalwar ritalwar commented Mar 10, 2024 •
edited
Loading

Proposed commit message

Restore the secret for packages that were disabled because of Kibana versions below 8.12, as they were causing errors.

Secrets were reverted for older stack version earlier in this PR - #9279

Now it is enabled only for stack 8.12 onwards.

For Prometheus and CockroachDB it is enabled for version 8.12.1 onwards, due to mapping conflicts resolved in the Fleet plugin.

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.

Related issues

@ritalwar ritalwar self-assigned this Mar 10, 2024
@ritalwar ritalwar requested a review from a team as a code owner March 10, 2024 09:12
@elasticmachine
Copy link
Copy Markdown

elasticmachine commented Mar 10, 2024 •
edited
Loading

🚀 Benchmarks report

To see the full report comment with /test benchmark fullreport

@ali786XI ali786XI self-requested a review March 11, 2024 05:58
@harnish-crest-data harnish-crest-data self-requested a review March 11, 2024 10:51
ali786XI
ali786XI approved these changes Mar 11, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@ali786XI ali786XI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ritalwar I tried loading the integrations with default configs in 8.12.0 and 2 integrations (cockroachdb and prometheus) in 8.12.1 & I didn't face any errors loading the packages. LGTM for the changes !!

@lalit-satapathy
Copy link
Copy Markdown
Contributor

lalit-satapathy commented Mar 12, 2024

@ritalwar, some packages are marked as: version: "^8.12.0" and some are marked as: version: "^8.12.1", what is the difference here?

ishleenk17
ishleenk17 reviewed Mar 12, 2024
View reviewed changes
packages/cockroachdb/changelog.yml Outdated
@@ -1,3 +1,8 @@
- version: "1.9.0"
changes:
- description: Enable secrets with Kibana upgrade to 8.12, resolving errors.
Copy link
Copy Markdown
Member

@ishleenk17 ishleenk17 Mar 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The version should be 8.12.1 in changelog here.

Copy link
Copy Markdown
Contributor Author

@ritalwar ritalwar Mar 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're discussing offline about updating this changelog message for all packages, will adjust accordingly.

@ritalwar
Copy link
Copy Markdown
Contributor Author

ritalwar commented Mar 12, 2024

@ritalwar, some packages are marked as: version: "^8.12.0" and some are marked as: version: "^8.12.1", what is the difference here?

In version 8.12.0 of Kibana, the Fleet plugin was refactored, fixing how dynamic mappings for integrations are generated. However, this change caused mapping conflicts during data ingestion, impacting integrations like Prometheus and CockroachDB. The issue was resolved in version 8.12.1, therefore an upgrade to this version for these packages. Detailed information here.

@lalit-satapathy
Copy link
Copy Markdown
Contributor

lalit-satapathy commented Mar 12, 2024

@ritalwar, some packages are marked as: version: "^8.12.0" and some are marked as: version: "^8.12.1", what is the difference here?

In version 8.12.0 of Kibana, the Fleet plugin was refactored, fixing how dynamic mappings for integrations are generated. However, this change caused mapping conflicts during data ingestion, impacting integrations like Prometheus and CockroachDB. The issue was resolved in version 8.12.1, therefore an upgrade to this version for these packages. Detailed information here.

Ok, We are resolving the dynamic mapping issue in this PR as well? So it is only for prometheus type packages?

@ishleenk17
Copy link
Copy Markdown
Member

ishleenk17 commented Mar 12, 2024

@ritalwar, some packages are marked as: version: "^8.12.0" and some are marked as: version: "^8.12.1", what is the difference here?

In version 8.12.0 of Kibana, the Fleet plugin was refactored, fixing how dynamic mappings for integrations are generated. However, this change caused mapping conflicts during data ingestion, impacting integrations like Prometheus and CockroachDB. The issue was resolved in version 8.12.1, therefore an upgrade to this version for these packages. Detailed information here.

Ok, We are resolving the dynamic mapping issue in this PR as well? So it is only for prometheus type packages?

Integrations using dynamic mappings would have this issue in 8.12

@lalit-satapathy
Copy link
Copy Markdown
Contributor

lalit-satapathy commented Mar 12, 2024

@ritalwar, some packages are marked as: version: "^8.12.0" and some are marked as: version: "^8.12.1", what is the difference here?

In version 8.12.0 of Kibana, the Fleet plugin was refactored, fixing how dynamic mappings for integrations are generated. However, this change caused mapping conflicts during data ingestion, impacting integrations like Prometheus and CockroachDB. The issue was resolved in version 8.12.1, therefore an upgrade to this version for these packages. Detailed information here.

Ok, We are resolving the dynamic mapping issue in this PR as well? So it is only for prometheus type packages?

Integrations using dynamic mappings would have this issue in 8.12

Should that be mixed with this work? This will disable secrets for someone running just 8.12.0.

@ritalwar
Copy link
Copy Markdown
Contributor Author

ritalwar commented Mar 12, 2024

Ok, We are resolving the dynamic mapping issue in this PR as well? So it is only for prometheus type packages?

We're not resolving the dynamic mapping issue, it's already fixed in this PR and available from version 8.12.1. Due to system test failures in 8.12.0, we had to upgrade to 8.12.1.

@ishleenk17
Copy link
Copy Markdown
Member

ishleenk17 commented Mar 12, 2024

@ritalwar, some packages are marked as: version: "^8.12.0" and some are marked as: version: "^8.12.1", what is the difference here?

In version 8.12.0 of Kibana, the Fleet plugin was refactored, fixing how dynamic mappings for integrations are generated. However, this change caused mapping conflicts during data ingestion, impacting integrations like Prometheus and CockroachDB. The issue was resolved in version 8.12.1, therefore an upgrade to this version for these packages. Detailed information here.

Ok, We are resolving the dynamic mapping issue in this PR as well? So it is only for prometheus type packages?

Integrations using dynamic mappings would have this issue in 8.12

Should that be mixed with this work? This will disable secrets for someone running just 8.12.0.

The CI/CD would fail for these packages if the version is 8.12.
Either we have to force merge the packages, even though CI/CD fails for them? or resolve them with 8.12.1

@elasticmachine
Copy link
Copy Markdown

elasticmachine commented Mar 13, 2024

💚 Build Succeeded

History

cc @ritalwar

@elastic-sonarqube
Copy link
Copy Markdown

elastic-sonarqube bot commented Mar 13, 2024

Quality Gate passed Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
100.0% 100.0% Coverage on New Code
0.0% 0.0% Duplication on New Code

See analysis details on SonarQube

agithomas
agithomas approved these changes Mar 13, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@agithomas agithomas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@ritalwar ritalwar merged commit ffd6a5c into elastic:main Mar 13, 2024
@elasticmachine
Copy link
Copy Markdown

elasticmachine commented Mar 13, 2024

Package activemq - 1.2.0 containing this change is available at https://epr.elastic.co/search?package=activemq

@elasticmachine
Copy link
Copy Markdown

elasticmachine commented Mar 13, 2024

Package apache_tomcat - 1.4.0 containing this change is available at https://epr.elastic.co/search?package=apache_tomcat

@elasticmachine
Copy link
Copy Markdown

elasticmachine commented Mar 13, 2024

Package prometheus_input - 0.4.0 containing this change is available at https://epr.elastic.co/search?package=prometheus_input

@elasticmachine
Copy link
Copy Markdown

elasticmachine commented Mar 13, 2024

Package rabbitmq - 1.13.0 containing this change is available at https://epr.elastic.co/search?package=rabbitmq

@elasticmachine
Copy link
Copy Markdown

elasticmachine commented Mar 13, 2024

Package salesforce - 0.14.0 containing this change is available at https://epr.elastic.co/search?package=salesforce

@elasticmachine
Copy link
Copy Markdown

elasticmachine commented Mar 13, 2024

Package spring_boot - 1.4.0 containing this change is available at https://epr.elastic.co/search?package=spring_boot

@elasticmachine
Copy link
Copy Markdown

elasticmachine commented Mar 13, 2024

Package websphere_application_server - 1.3.0 containing this change is available at https://epr.elastic.co/search?package=websphere_application_server

gizas pushed a commit that referenced this pull request Mar 13, 2024
@ritalwar @gizas
Re-enable secrets for packages disabled due to Kibana versions below … (
19363de 
#9321)

* Re-enable secrets for packages disabled due to Kibana versions below 8.10 errors.
qcorporation pushed a commit that referenced this pull request Feb 3, 2025
@ritalwar @gizas
Re-enable secrets for packages disabled due to Kibana versions below … (
819a686 
#9321)

* Re-enable secrets for packages disabled due to Kibana versions below 8.10 errors.
qcorporation pushed a commit that referenced this pull request Feb 4, 2025
@ritalwar @gizas
Re-enable secrets for packages disabled due to Kibana versions below … (
6a54642 
#9321)

* Re-enable secrets for packages disabled due to Kibana versions below 8.10 errors.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ishleenk17 ishleenk17 ishleenk17 left review comments

@agithomas agithomas agithomas approved these changes

+2 more reviewers

@harnish-crest-data harnish-crest-data harnish-crest-data approved these changes

@ali786XI ali786XI ali786XI approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@ritalwar ritalwar

Labels

>enhancement Integration:activemq ActiveMQ Integration:apache_tomcat Apache Tomcat Integration:azure_app_service Azure App Service Integration:azure_billing Azure Billing Metrics Integration:azure_functions Azure Functions Integration:cassandra Cassandra Integration:ceph Ceph Integration:citrix_adc Citrix ADC Integration:cockroachdb CockroachDB Metrics Integration:golang Golang Integration:kafka_log Custom Kafka Logs Integration:kafka Kafka Integration:mysql MySQL Integration:nginx Nginx Integration:oracle_weblogic Oracle WebLogic Integration:postgresql PostgreSQL Integration:prometheus_input Prometheus Input Integration:prometheus Prometheus Integration:rabbitmq RabbitMQ Logs and Metrics Integration:salesforce Salesforce Integration:spring_boot Spring Boot Integration:websphere_application_server WebSphere Application Server

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@ritalwar @elasticmachine @lalit-satapathy @ishleenk17 @agithomas @harnish-crest-data @ali786XI @andrewkroh