Agent 7 support#588
Merged
albertvaka merged 38 commits intomasterfrom Dec 18, 2019
Merged
Conversation
albertvaka
force-pushed
the
albertvaka/agent-7-support
branch
from
319e7c9 to
52ef6dd
Compare
Renamed to legacy_conf_dir
albertvaka
force-pushed
the
albertvaka/agent-7-support
branch
from
b619b3d to
dcf1416
Compare
truthbk
reviewed
Dec 5, 2019
Member
There was a problem hiding this comment.
Bro..... 👏 👏 👏
Incredible refactor, thank you so much for doing this. Such an improved structure, so much cleaner on so many levels. I believe the A7 support looks great too. Added a few comments, but most are just little things, suggestions or nits. The spec tests being green makes me quite confident too!
🙇
Co-Authored-By: Jaime Fullaondo <jaime.fullaondo@datadoghq.com>
albertvaka
force-pushed
the
albertvaka/agent-7-support
branch
from
69b1232 to
03b7c19
Compare
truthbk
approved these changes
Dec 10, 2019
Member
truthbk
left a comment
truthbk
left a comment
There was a problem hiding this comment.
This looks great! Thank you! 🙇
| "name": "datadog-datadog_agent", | ||
| "version": "3.0.0", | ||
| "author": "James Turnbull (<james@lovedthanlost.net>) and Rob Terhaar (<rob@atlanticdynamic>) for Datadog Inc.", | ||
| "author": "James Turnbull <james@lovedthanlost.net>, Rob Terhaar <rob@atlanticdynamic>, Jaime Fullaondo <jaime.fullaondo@datadoghq.com>, Albert Vaca <albert.vaca@datadoghq.com>", |
Member
There was a problem hiding this comment.
I think you deserve to be first after all this work but 🙇
…support # Conflicts: # metadata.json
KSerrania
reviewed
Dec 17, 2019
|
|
||
| | variable name | description | | ||
| |-----------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | ||
| | `agent_major_version` | The version of the Agent to install: either 5, 6 or 7 (default: 7). | |
Contributor
There was a problem hiding this comment.
I think agent_repo_uri should be mentioned here, as it's the only way to use a custom repo. For ubuntu / debian, agent_default_release should be documented as well.
Moreover, the behavior and expected values of agent_repo_uri should be indicated (right now, you have to dig through the source code to know what you're supposed to do):
- for
apt, the repo url (without release branch and component) (eg.https://apt.datadoghq.com/) - for
yum, the repo url with the release branch, component and arch (eg.https://yum.datadoghq.com/stable/7/x86_64) - for Windows, the bucket url prefix (eg.
https://https://s3.amazonaws.com/ddagent-windows-stable/)
Contributor
Author
There was a problem hiding this comment.
This was undocumented before A7 support, so I left it as it was. I documented both in init.pp (in the source code, but that's where most parameter descriptions are).
albertvaka
force-pushed
the
albertvaka/agent-7-support
branch
from
785b0f8 to
7128420
Compare
As this is used in Windows.
KSerrania
reviewed
Dec 18, 2019
Co-Authored-By: Kylian Serrania <kylian.serrania@datadoghq.com>
cegeka-jenkins
pushed a commit
to cegeka/puppet-datadog_agent
that referenced
this pull request
Apr 6, 2020
- Removes agent6/agent5 prefixes in variable names. - Introduces `agent_major_version` setting that replaces `agent5_enable`. - Unifies config for Agent 5/6 repos and removes use of facter. - Removes uses of `validate_legacy`. - Keeps the group ownership of config files as 'dd-agent', as they come in the agent package. - Remove `service_name` and `package_name` parameters, since there is no use in changing these. - Import the new RPM signing key only when installing Agent 7. - Bumps major version to 3.0. - Removes 1.x and 2.x instructions from README: these can still be found in puppetforge selecting an older version of the module.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
agent_major_versionsetting that replacesagent5_enable.validate_legacy.service_nameandpackage_nameparameters, since there is no use in changing these.