diff --git a/.github/workflows/sync-plugins.yml b/.github/workflows/sync-plugins.yml index d850122ee7..de736a420d 100644 --- a/.github/workflows/sync-plugins.yml +++ b/.github/workflows/sync-plugins.yml @@ -81,8 +81,13 @@ jobs: - name: Checkout influxdb3_plugins (sparse) run: | +<<<<<<< HEAD + git clone --filter=blob:none --sparse https://github.com/influxdata/influxdb3_plugins.git influxdb3_plugins + cd influxdb3_plugins +======= git clone --filter=blob:none --sparse https://github.com/influxdata/influxdb3_plugins.git .ext/influxdb3_plugins cd .ext/influxdb3_plugins +>>>>>>> origin/master git sparse-checkout set influxdata/ scripts/ git checkout ${{ steps.inputs.outputs.source_commit }} @@ -106,7 +111,11 @@ jobs: - name: Validate plugin READMEs id: validate run: | +<<<<<<< HEAD + cd influxdb3_plugins +======= cd .ext/influxdb3_plugins +>>>>>>> origin/master # Determine which plugins to validate if [[ "${{ steps.inputs.outputs.plugins }}" == "all" ]]; then @@ -175,6 +184,16 @@ jobs: - name: Transform plugin documentation if: steps.validate.outputs.validation_passed == 'true' run: | +<<<<<<< HEAD + cd docs-v2/helper-scripts/influxdb3-plugins + + # Set PLUGIN_DIR for the transformation script + export INFLUXDB3_PLUGINS_PATH="../../../.ext/influxdb3_plugins" + + # Run the transformation + if [[ "${{ steps.inputs.outputs.plugins }}" == "all" ]]; then + node port_to_docs.js +======= cd docs-v2 # Set PLUGIN_DIR for the transformation script @@ -183,13 +202,18 @@ jobs: # Run the transformation if [[ "${{ steps.inputs.outputs.plugins }}" == "all" ]]; then node helper-scripts/influxdb3-plugins/port_to_docs.js +>>>>>>> origin/master else # Transform specific plugins IFS=',' read -ra PLUGIN_ARRAY <<< "${{ steps.inputs.outputs.plugins }}" for plugin in "${PLUGIN_ARRAY[@]}"; do plugin=$(echo "$plugin" | xargs) # trim whitespace echo "Transforming plugin: $plugin" +<<<<<<< HEAD + node port_to_docs.js --plugin "$plugin" +======= node helper-scripts/influxdb3-plugins/port_to_docs.js --plugin "$plugin" +>>>>>>> origin/master done fi diff --git a/.gitignore b/.gitignore index edb903c392..18b8c53b18 100644 --- a/.gitignore +++ b/.gitignore @@ -42,6 +42,10 @@ tmp # User context files for AI assistant tools .context/* !.context/README.md +<<<<<<< HEAD +influxdb3_plugins/ +======= # External repos .ext/* +>>>>>>> origin/master diff --git a/helper-scripts/influxdb3-plugins/docs_mapping.yaml b/helper-scripts/influxdb3-plugins/docs_mapping.yaml index 35c0447b0a..9e09add8f6 100644 --- a/helper-scripts/influxdb3-plugins/docs_mapping.yaml +++ b/helper-scripts/influxdb3-plugins/docs_mapping.yaml @@ -3,20 +3,94 @@ plugins: basic_transformation: +<<<<<<< HEAD + source: ./influxdb3_plugins/influxdata/basic_transformation/README.md + target: content/shared/influxdb3-plugins/plugins-library/official/basic-transformation.md +======= source: ../../.ext/influxdb3_plugins/influxdata/basic_transformation/README.md target: ../../content/shared/influxdb3-plugins/plugins-library/official/basic-transformation.md +>>>>>>> origin/master category: official additional_sections: - schema_requirements - logging +<<<<<<< HEAD + + downsampler: + source: ./influxdb3_plugins/influxdata/downsampler/README.md + target: content/shared/influxdb3-plugins/plugins-library/official/downsampler.md +======= downsampler: source: ../../.ext/influxdb3_plugins/influxdata/downsampler/README.md target: ../../content/shared/influxdb3-plugins/plugins-library/official/downsampler.md +>>>>>>> origin/master category: official additional_sections: - schema_management - logging +<<<<<<< HEAD + + forecast_error_evaluator: + source: ./influxdb3_plugins/influxdata/forecast_error_evaluator/README.md + target: content/shared/influxdb3-plugins/plugins-library/official/forecast-error-evaluator.md + category: official + additional_sections: + - logging + + influxdb_to_iceberg: + source: ./influxdb3_plugins/influxdata/influxdb_to_iceberg/README.md + target: content/shared/influxdb3-plugins/plugins-library/official/influxdb-to-iceberg.md + category: official + additional_sections: + - logging + + mad_check: + source: ./influxdb3_plugins/influxdata/mad_check/README.md + target: content/shared/influxdb3-plugins/plugins-library/official/mad-check.md + category: official + additional_sections: + - logging + + notifier: + source: ./influxdb3_plugins/influxdata/notifier/README.md + target: content/shared/influxdb3-plugins/plugins-library/official/notifier.md + category: official + additional_sections: + - logging + + prophet_forecasting: + source: ./influxdb3_plugins/influxdata/prophet_forecasting/README.md + target: content/shared/influxdb3-plugins/plugins-library/official/prophet-forecasting.md + category: official + additional_sections: + - logging + + state_change: + source: ./influxdb3_plugins/influxdata/state_change/README.md + target: content/shared/influxdb3-plugins/plugins-library/official/state-change.md + category: official + additional_sections: + - logging + + stateless_adtk_detector: + source: ./influxdb3_plugins/influxdata/stateless_adtk_detector/README.md + target: content/shared/influxdb3-plugins/plugins-library/official/stateless-adtk-detector.md + category: official + additional_sections: + - logging + + system_metrics: + source: ./influxdb3_plugins/influxdata/system_metrics/README.md + target: content/shared/influxdb3-plugins/plugins-library/official/system-metrics.md + category: official + additional_sections: + - logging + + threshold_deadman_checks: + source: ./influxdb3_plugins/influxdata/threshold_deadman_checks/README.md + target: content/shared/influxdb3-plugins/plugins-library/official/threshold-deadman-checks.md +======= forecast_error_evaluator: source: ../../.ext/influxdb3_plugins/influxdata/forecast_error_evaluator/README.md @@ -77,6 +151,7 @@ plugins: threshold_deadman_checks: source: ../../.ext/influxdb3_plugins/influxdata/threshold_deadman_checks/README.md target: ../../content/shared/influxdb3-plugins/plugins-library/official/threshold-deadman-checks.md +>>>>>>> origin/master category: official additional_sections: - logging @@ -119,4 +194,8 @@ exceptions: # Plugins that require manual review after transformation manual_review: - influxdb_to_iceberg # Complex configuration may need manual verification +<<<<<<< HEAD + - forecast_error_evaluator # Multiple notification options need review +======= - forecast_error_evaluator # Multiple notification options need review +>>>>>>> origin/master diff --git a/helper-scripts/influxdb3-plugins/port_to_docs.js b/helper-scripts/influxdb3-plugins/port_to_docs.js index 590b45b0f2..dd16ffd796 100644 --- a/helper-scripts/influxdb3-plugins/port_to_docs.js +++ b/helper-scripts/influxdb3-plugins/port_to_docs.js @@ -476,7 +476,11 @@ process.on('unhandledRejection', (reason, promise) => { }); // Run main function +<<<<<<< HEAD +if (import.meta.url === `file://${process.argv[1]}`) { +======= if (import.meta.url.endsWith(process.argv[1])) { +>>>>>>> origin/master main().catch((error) => { console.error('❌ Fatal error:', error.message); process.exit(1); diff --git a/package.json b/package.json index 77f1c2ee2a..1e88bf7473 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,11 @@ "test:codeblocks:v2": "docker compose run --rm --name v2-pytest v2-pytest", "test:codeblocks:stop-monitors": "./test/scripts/monitor-tests.sh stop cloud-dedicated-pytest && ./test/scripts/monitor-tests.sh stop clustered-pytest", "test:e2e": "node cypress/support/run-e2e-specs.js", +<<<<<<< HEAD + "test:shortcode-examples": "node cypress/support/run-e2e-specs.js --spec \"cypress/e2e/content/article-links.cy.js\" content/example.md", +======= "test:shortcode-examples": "node cypress/support/run-e2e-specs.js --spec \"cypress/e2e/content/index.cy.js\" content/example.md", +>>>>>>> origin/master "sync-plugins": "cd helper-scripts/influxdb3-plugins && node port_to_docs.js", "sync-plugins:dry-run": "cd helper-scripts/influxdb3-plugins && node port_to_docs.js --dry-run", "validate-plugin-config": "cd helper-scripts/influxdb3-plugins && node port_to_docs.js --validate"