-
Notifications
You must be signed in to change notification settings - Fork 231
[AGENTONB-2675] Remove deprecated deb/rpm installer and support SSI using install-ssi.sh script
#682
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[AGENTONB-2675] Remove deprecated deb/rpm installer and support SSI using install-ssi.sh script
#682
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Auto YAML formatting and removal of standalone installer tests
|
|
||
| # Configure APM host injection. Possible values are: "all", "host" or "docker". | ||
| datadog_apm_instrumentation_enabled: "" | ||
| # datadog_apm_instrumentation_enabled: "" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
APM SSI is opt-in: users should specifically set a value. There is validation later down the line
| datadog_apm_instrumentation_libraries: [] | ||
|
|
||
| # Used to send telemetry data to datadog on installation | ||
| datadog_apm_telemetry_endpoint: "https://instrumentation-telemetry-intake.{{ datadog_site | default('datadoghq.com') }}/api/v2/apmtelemetry" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No tasks to send installer telemetry, so let's remove this un-used variable
| # Registry, auth, and version for the datadog installer | ||
| datadog_installer_registry: "" | ||
| datadog_installer_auth: "" | ||
| datadog_installer_version: "" | ||
| installer_registry_config: {} | ||
|
|
||
| # Version for the datadog apm inject package | ||
| datadog_apm_inject_version: "" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Moved higher up
| owner: "{{ agent_dd_user }}" | ||
| group: "{{ agent_dd_group }}" | ||
| mode: "0644" | ||
| when: datadog_apm_instrumentation_enabled is defined |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Required by removing the default empty string value for datadog_apm_instrumentation_enabled while it was being used in telemetry rendering. install.json is only used when APM SSI is enabled, so no need to create the file if not enabled.
| - name: Set plain includepkgs variable | ||
| ansible.builtin.set_fact: | ||
| agent_datadog_includepkgs: "{{ datadog_agent_flavor }} | ||
| {{ agent_dd_apm_install_pkgs | default([], true) | join(' ') }}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should have been removed as part of a previous clean-up PR when removing legacy legacy APM libraries (pre-OCI, we'd install them as deb/rpm)
What does this PR do ?
datadog-installerdeb/rpm package: mostly 7beaf9b.circleci/config.ymlinstall-ssi.shscript for APM SSIFiles help
tasks/remove-legacy-installer.ymltasks/apm-single-step-instrumentation.ymlandtasks/main.ymlQA
datadog-installerstatusNotes:
On some distros like AL2023, with Python3, we hit the "classic":
when using
ansible.builtin.package. While we could use the specific correct module (example in 090196c), it adds complexity/is ugly and more error-prone. Instead, let's ignore errors and treat it as best-effort -> it will fail on AL2023 depending on the Ansible version, but it's fine as we treat it as best-effort removal, it should impact less and less customers (only those who were in preview)