Skip to content

Merge source repo #3

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

Open
wants to merge 58 commits into
base: master
Choose a base branch
from
Open

Merge source repo #3

wants to merge 58 commits into from

Conversation

kbiernat
Copy link

No description provided.

norrland and others added 30 commits May 8, 2018 15:48
Make pillardata for checks optional. Allows for separation of different
checks for different roles/hosts.

Test by removing "checks:" from pillars.

Test by adding separate pillar file with:
```
datadog:
  checks:
    mycheck:
      init_config:
      instances:
        - name: foo
```
* Also update the 'service.running' state
* Do some Jinja cleaning
cleanup and make config more flexible, preparing to support A6
…to install (#26)

* Support A6 and specific version installations
* Add redhat-based (CentOS) test environment
* Automatically determine Agent-specific defaults
* Fix code-blocks in README
Retry on failure when pulling the gpg key from keyserver.ubuntu.com
Use of short GPG key fingerprints should be avoided because of the high risk
of collisions there is with those.
This replaces the short key fingerprint with the long one.
[install] Use long apt key fingerprint
In the near future, the Agent packages will be signed with
our newer GPG key. In preparation for this, the RHEL install
should import the new associated public key.
…og.yaml (#35)

Separates the root pillar object 'datadog' into two sub-objects:
- "config", which describes the contents of the datadog.yaml config file
that will be installed on the minions,
- "install_settings", which contains various customizable parameters
for the Agent install, such as the Agent version.

With this new structure, any arbitrary key can be put in "config",
and will be reflected in the minions' config files.

Agent 5 is using a .ini config file, and there's no ini renderer available easily, so we're using the old way with explicitly supported options (except a little cleaner: we're not matching regexes in a file we don't have control of). To comply with what was previously supported on Agent 5 on SaltStack, the api_key option is supported for now.
Removes the pkg_name, service_name, config_folder and config_file options, as they shouldn't be set by the user.
Removes the checks_confd option ; instead, uses the Agent confd_path option to get the location where checks configs are located.
Adds a version option for each check configuration, allowing users to choose the check version used. Uses the datadog-agent integration command to get and install the chosen version.
Agent 6 only.

The check configuration has been moved under the config option of the check.

Co-Authored-By: Albert Vaca <[email protected]>
Changes the formula to support the Agent v7 distribution channels (apt & yum repositories).
latest will now point to the latest package in the 7 channel.
Updates documentation to include v7.

Co-Authored-By: Albert Vaca <[email protected]>
Co-Authored-By: Olivier Vielpeau <[email protected]>
Fixes the yum repository path for beta installs (Agent 6 betas are in beta/6, Agent 7 betas in beta/7).
Fixes the regex which checks if a beta version will be installed (there was a -[0-9]+ too much at the end of the regex). The previous regex would match 7.15.0~beta.1-1 and not 7.15.0~beta.1, which makes the install fail since we add the -1 again during the installation (giving 7.15.0~beta.1-1-1, which is not an existing version).
Agent 7 packages will only be signed using our new GPG key, so we can remove the old one from the repository file if installing Agent 7.
albertvaka and others added 28 commits December 16, 2019 13:33
Remove conf.d/<check>.yaml if a check is enabled and Agent 6/7 is installed, preventing config file duplication.
Fixes the provided Dockerfiles to make the mock systemctl work, allowing the formula to succeed in manual tests.
Adds CircleCI jobs to run the formula, on Ubuntu and CentOS, for Agent 5, 6 and 7, to check that it does work
Adds simple python checks to test that we end up in a correct state after a formula run (correct installation state + Agent major version).
* DOCS-632 SaltStack README

* updates

* updates

* updates

* updates

* Add CODEOWNERS

* Update CONTRIBUTING.md

Co-Authored-By: cswatt <[email protected]>

* updates

* Update README.md

Co-authored-by: Kylian Serrania <[email protected]>

Co-authored-by: cswatt <[email protected]>
Co-authored-by: Kylian Serrania <[email protected]>
* Add install_info

* [CI] Add tests for install_info to CI
* addition of logs check section, rename section to checks

* Apply suggestions from code review

Co-authored-by: Kylian Serrania <[email protected]>

* Apply suggestions from code review

Co-authored-by: Kylian Serrania <[email protected]>

* Fix triple backquote position

Co-authored-by: Kylian Serrania <[email protected]>
Release version 3.1 of the formula.
Adds a third_party option to the checks config to specify that the check to install is a third-party check (defined in https://github.com/DataDog/integrations-extras).
Instead of making a direct comparison, use the built-in to_bool filter.
Only try to install integration if the targeted version is not already installed (to make the formula idempotent).
Watch integration installs: restart the datadog-agent service when at least one integration install happens.
Adds the new GPG keys for the apt and yum repos to the list of trusted keys.
Release version 3.3 of the formula.
* By default, get keys from keys.datadoghq.com, not Ubuntu keyserver
* Always add the DATADOG_APT_KEY_CURRENT.public key (contains key used to sign current repodata)
* Add 'signed-by' option to all sources list lines
* On Debian >= 9 and Ubuntu >= 16, only add keys to /usr/share/keyrings/datadog-archive-keyring.gpg
* On older systems, also add the same keyring to /etc/apt/trusted.gpg.d

Co-authored-by: Kylian Serrania <[email protected]>
* DOCS-2275 Lint README

* Update README.md

Co-authored-by: Kari Halsted <[email protected]>

Co-authored-by: Kari Halsted <[email protected]>
Changes the default branch mentioned in the docs to main.
@KSerrania KSerrania deleted the branch ImproveDigital:master August 12, 2021 11:40
@KSerrania KSerrania deleted the master branch August 12, 2021 11:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants