Skip to content

Commit

Permalink
Merge pull request #60 from xFuture603/transfer_collection_to_telekom…
Browse files Browse the repository at this point in the history
…_mms

transfer ansible collection to Telekom MMS
  • Loading branch information
xFuture603 authored Aug 29, 2023
2 parents 946b468 + 0dc0d0e commit bd801e0
Show file tree
Hide file tree
Showing 14 changed files with 62 additions and 62 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Check out code
uses: actions/checkout@v3
with:
path: ansible_collections/t_systems_mms/ansible_collection_icinga
path: ansible_collections/telekom_mms/ansible_collection_icinga

- name: Set up Python ${{ matrix.ansible }}
uses: actions/setup-python@v4
Expand All @@ -45,7 +45,7 @@ jobs:

- name: Run sanity tests
run: ansible-test sanity --docker -v --color
working-directory: ./ansible_collections/t_systems_mms/ansible_collection_icinga
working-directory: ./ansible_collections/telekom_mms/ansible_collection_icinga

integration:
runs-on: ubuntu-20.04
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
- name: Check out code
uses: actions/checkout@v3
with:
path: ansible_collections/t_systems_mms/ansible_collection_icinga
path: ansible_collections/telekom_mms/ansible_collection_icinga

- name: Set up Python 3.8
uses: actions/setup-python@v4
Expand All @@ -111,18 +111,18 @@ jobs:
run: |
python3 -m pip install --upgrade pip
python3 -m pip install -r requirements.txt
working-directory: ansible_collections/t_systems_mms/ansible_collection_icinga
working-directory: ansible_collections/telekom_mms/ansible_collection_icinga

- name: Test role icinga_agent with molecule
run: molecule test
working-directory: ansible_collections/t_systems_mms/ansible_collection_icinga/roles/icinga_agent
working-directory: ansible_collections/telekom_mms/ansible_collection_icinga/roles/icinga_agent
env:
PY_COLORS: "1"
ANSIBLE_FORCE_COLOR: "1"

- name: Test role icinga_plugins with molecule
run: molecule test
working-directory: ansible_collections/t_systems_mms/ansible_collection_icinga/roles/icinga_plugins
working-directory: ansible_collections/telekom_mms/ansible_collection_icinga/roles/icinga_plugins
env:
PY_COLORS: "1"
ANSIBLE_FORCE_COLOR: "1"
2 changes: 1 addition & 1 deletion .github/workflows/galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ on:

jobs:
deploy:
uses: T-Systems-MMS/.github/.github/workflows/ansible-galaxy-publish.yml@main
uses: telekom-mms/.github/.github/workflows/ansible-galaxy-publish.yml@main
secrets:
GALAXY_API_KEY: ${{ secrets.GALAXY_API_KEY }}
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ jobs:
commit-message: update changelog
force-add: true
files: CHANGELOG.md
name: T-Systems MMS
email: frage@t-systems-mms.com
name: Deutsche Telekom MMS GmbH
email: mms@telekom.de

# do a second checkout to prevent race situation
# changelog gets updated but action works on old commit id
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Thanks for your interest in contributing! Please read carefully through our guid

## Issue Tracking

We use [GitHub Issues](https://github.com/T-Systems-MMS/ansible-collection-icinga/issues) to track all tasks related to this project.
We use [GitHub Issues](https://github.com/telekom-mms/ansible-collection-icinga/issues) to track all tasks related to this project.

## Contribute your changes

Expand All @@ -28,7 +28,7 @@ A *clone* is a downloaded version of a repository. Cloning our fork lets you dow
Use `git clone` to clone your fork

```
$ git clone https://github.com/T-Systems-MMS/ansible-collection-icinga.git
$ git clone https://github.com/telekom-mms/ansible-collection-icinga.git
```

### Add your changes
Expand Down Expand Up @@ -84,7 +84,7 @@ $ git push origin master

### Open a Pull Request

1. Find the [Create Pull Request](https://github.com/T-Systems-MMS/ansible-collection-icinga/compare/) button
1. Find the [Create Pull Request](https://github.com/telekom-mms/ansible-collection-icinga/compare/) button
2. Select **compare across forks**
3. Add your forked branch and select the right base repository
3. Click **Create Pull Request**
Expand Down
40 changes: 20 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ This Ansible collection contains:

3. A [role](roles/icinga_downtime) to manage downtimes in your Icinga

3. The [collection](https://github.com/T-Systems-MMS/ansible-collection-icinga-director) to deploy your Icinga master via the Icinga Director module
3. The [collection](https://github.com/telekom-mms/ansible-collection-icinga-director) to deploy your Icinga master via the Icinga Director module

4. An extra [collection](https://github.com/T-Systems-MMS/ansible-collection-icinga-business-process) to use the [Business Process module](https://github.com/Icinga/icingaweb2-module-businessprocess)
4. An extra [collection](https://github.com/telekom-mms/ansible-collection-icinga-business-process) to use the [Business Process module](https://github.com/Icinga/icingaweb2-module-businessprocess)

5. Ansible playbooks to create various objects in Icinga 2 using the director API

Expand All @@ -24,14 +24,14 @@ This Ansible collection contains:

If you use an older version, you can install it with Ansible Galaxy:
```
ansible-galaxy collection install t_systems_mms.ansible_collection_icinga
ansible-galaxy collection install telekom_mms.ansible_collection_icinga
```

Alternatively put the collection into a `requirements.yml` file:
```
---
collections:
- t_systems_mms.ansible_collection_icinga
- telekom_mms.ansible_collection_icinga
```

## Documentation
Expand All @@ -47,11 +47,11 @@ Examples on how to use the role can be found [here](roles/icinga_plugins/README.

**icinga_director collection:**

Check out the 'Documentation' part for the modules [here](https://github.com/T-Systems-MMS/ansible-collection-icinga-director#documentation)
Check out the 'Documentation' part for the modules [here](https://github.com/telekom-mms/ansible-collection-icinga-director#documentation)

**icinga_business_process collection:**

Check out the 'Documentation' part for this collection [here](https://github.com/T-Systems-MMS/ansible-collection-icinga-business-process/blob/master/roles/ansible_icinga_business_process/README.md)
Check out the 'Documentation' part for this collection [here](https://github.com/telekom-mms/ansible-collection-icinga-business-process/blob/master/roles/ansible_icinga_business_process/README.md)

**icinga playbooks:**

Expand All @@ -70,29 +70,29 @@ You can use these playbooks in your playbook like this:

```
- name: Import mms standard playbook to create services that other checks depend on
import-playbook: t_systems_mms.ansible_collection_icinga.mms_standard
import-playbook: telekom_mms.ansible_collection_icinga.mms_standard
- name: Import playbook to create azure oauth token check
import-playbook: t_systems_mms.ansible_collection_icinga.check_azure_oauth_token
import-playbook: telekom_mms.ansible_collection_icinga.check_azure_oauth_token
- name: Import playbook to create gitlab_scheduler check
import-playbook: t_systems_mms.ansible_collection_icinga.check_gitlab_scheduler
import-playbook: telekom_mms.ansible_collection_icinga.check_gitlab_scheduler
- name: Import playbook to create check_https checks
import-playbook: t_systems_mms.ansible_collection_icinga.check_https
import-playbook: telekom_mms.ansible_collection_icinga.check_https
```

Or call them from the command line:
```
ansible-playbook t_systems_mms.ansible_collection_icinga.mms_standard
ansible-playbook t_systems_mms.ansible_collection_icinga.check_azure_oauth_token
ansible-playbook t_systems_mms.ansible_collection_icinga.check_gitlab_scheduler
ansible-playbook t_systems_mms.ansible_collection_icinga.check_https
ansible-playbook t_systems_mms.ansible_collection_icinga.check_json
ansible-playbook t_systems_mms.ansible_collection_icinga.check_json_azure_restapi
ansible-playbook t_systems_mms.ansible_collection_icinga.check_json_azure_restapi_resourcehealth
ansible-playbook t_systems_mms.ansible_collection_icinga.template_empty_host
ansible-playbook telekom_mms.ansible_collection_icinga.mms_standard
ansible-playbook telekom_mms.ansible_collection_icinga.check_azure_oauth_token
ansible-playbook telekom_mms.ansible_collection_icinga.check_gitlab_scheduler
ansible-playbook telekom_mms.ansible_collection_icinga.check_https
ansible-playbook telekom_mms.ansible_collection_icinga.check_json
ansible-playbook telekom_mms.ansible_collection_icinga.check_json_azure_restapi
ansible-playbook telekom_mms.ansible_collection_icinga.check_json_azure_restapi_resourcehealth
ansible-playbook telekom_mms.ansible_collection_icinga.template_empty_host
```

## License
Expand All @@ -103,5 +103,5 @@ GPLv3

* Christopher Grau
* Daniel Uhlmann
* Contributors from [ansible-collection-icinga-director ](https://github.com/T-Systems-MMS/ansible-collection-icinga-director/graphs/contributors)
* Contributors from [ansible-collection-icinga-business-process](https://github.com/T-Systems-MMS/ansible-collection-icinga-business-process/graphs/contributors)
* Contributors from [ansible-collection-icinga-director ](https://github.com/telekom-mms/ansible-collection-icinga-director/graphs/contributors)
* Contributors from [ansible-collection-icinga-business-process](https://github.com/telekom-mms/ansible-collection-icinga-business-process/graphs/contributors)
18 changes: 9 additions & 9 deletions galaxy.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
---
namespace: t_systems_mms
namespace: telekom_mms
name: ansible_collection_icinga
version: 1.1.1
readme: README.md
authors:
- Christopher Grau <christopher.grau@t-systems.com>
- Daniel Uhlmann <daniel.uhlmann@t-systems.com>
- Christopher Grau <c.grau@telekom.de>
- Daniel Uhlmann <daniel.uhlmann@telekom.de>
description: >-
This collection serves as a kind of 'meta collection' for roles and collections, which are used for the
configuration and administration of individual components of Icinga.
Additionally, this collection is used to install the Icinga agent and roll out custom checks for every agent.
dependencies:
t_systems_mms.icinga_director: "*"
t_systems_mms.icinga_business_process: "*"
telekom_mms.icinga_director: "*"
telekom_mms.icinga_business_process: "*"
license:
- GPL-3.0-only
license_file: ""
Expand All @@ -23,7 +23,7 @@ tags:
- collection
- director
- plugins
repository: https://github.com/T-Systems-MMS/ansible-collection-icinga
documentation: https://github.com/T-Systems-MMS/ansible-collection-icinga
homepage: https://github.com/T-Systems-MMS/ansible-collection-icinga
issues: https://github.com/T-Systems-MMS/ansible-collection-icinga/issues
repository: https://github.com/telekom-mms/ansible-collection-icinga
documentation: https://github.com/telekom-mms/ansible-collection-icinga
homepage: https://github.com/telekom-mms/ansible-collection-icinga
issues: https://github.com/telekom-mms/ansible-collection-icinga/issues
6 changes: 3 additions & 3 deletions roles/icinga_agent/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Ansible Role - t_systems_mms.ansible_collection_icinga.icinga_agent
# Ansible Role - telekom_mms.ansible_collection_icinga.icinga_agent

This role installs and configures the icinga agent.
## Variables
Expand Down Expand Up @@ -83,7 +83,7 @@ icinga_agent_enable_features:
- hosts: localhost
gather_facts: true
collections:
- t_systems_mms.ansible_collection_icinga
- telekom_mms.ansible_collection_icinga
vars:
icinga_agent_endpoints:
- name: "icinga2-master1.localdomain"
Expand All @@ -108,7 +108,7 @@ icinga_agent_enable_features:
- hosts: localhost
gather_facts: true
collections:
- t_systems_mms.ansible_collection_icinga
- telekom_mms.ansible_collection_icinga
vars:
icinga_agent_registration: true
icinga_agent_endpoints:
Expand Down
2 changes: 1 addition & 1 deletion roles/icinga_agent/molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
- molecule-idempotence-notest

collections:
- t_systems_mms.ansible_collection_icinga
- telekom_mms.ansible_collection_icinga

roles:
- icinga_agent
Expand Down
4 changes: 2 additions & 2 deletions roles/icinga_downtime/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Ansible Role - t_systems_mms.ansible_collection_icinga.icinga_downtime
# Ansible Role - telekom_mms.ansible_collection_icinga.icinga_downtime

This role manages Icinga downtimes with Ansible via the REST API.
You can add a downtime for a group or a single host, both included or excluded their running services.
Expand Down Expand Up @@ -43,7 +43,7 @@ Additionally current downtimes set by Ansible can be removed.
connection: local
gather_facts: false
collections:
- t_systems_mms.ansible_collection_icinga
- telekom_mms.ansible_collection_icinga
roles:
- icinga_downtime
```
Expand Down
8 changes: 4 additions & 4 deletions roles/icinga_plugins/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Ansible Role - t_systems_mms.ansible_collection_icinga.icinga_plugins
# Ansible Role - telekom_mms.ansible_collection_icinga.icinga_plugins

This role copies custom checks to the wished icinga-agent node.

Expand Down Expand Up @@ -36,7 +36,7 @@ dependency_packages:
- hosts: localhost
gather_facts: true
collections:
- t_systems_mms.ansible_collection_icinga
- telekom_mms.ansible_collection_icinga
vars:
icinga_plugins_path: "{{ playbook_dir }}/../files"
roles:
Expand All @@ -48,7 +48,7 @@ dependency_packages:
- hosts: localhost
gather_facts: true
collections:
- t_systems_mms.ansible_collection_icinga
- telekom_mms.ansible_collection_icinga
vars:
icinga_plugins_git_repo_url: https://github.com/example/my-public-plugins.git
roles:
Expand All @@ -60,7 +60,7 @@ dependency_packages:
- hosts: localhost
gather_facts: true
collections:
- t_systems_mms.ansible_collection_icinga
- telekom_mms.ansible_collection_icinga
vars:
icinga_plugins_git_repo_url: https://<username>:<token>@github.com/example/my-private-plugins.git
roles:
Expand Down
2 changes: 1 addition & 1 deletion roles/icinga_plugins/molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
- name: Converge
hosts: all
collections:
- t_systems_mms.ansible_collection_icinga
- telekom_mms.ansible_collection_icinga

vars:
icinga_plugins_git_repo_url: https://github.com/beechesII/icinga_plugins.git
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/targets/icinga/icinga_agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
hosts: localhost
gather_facts: true
roles:
- t_systems_mms.ansible_collection_icinga.icinga_agent
- telekom_mms.ansible_collection_icinga.icinga_agent
vars:
icinga_agent_endpoints:
- name: icinga2-master1.localdomain
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/targets/icinga/icinga_plugins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
hosts: localhost
gather_facts: true
roles:
- t_systems_mms.ansible_collection_icinga.icinga_plugins
- telekom_mms.ansible_collection_icinga.icinga_plugins
post_tasks:
- name: Verify that icinga2 package is installed
ansible.builtin.yum:
Expand Down
16 changes: 8 additions & 8 deletions tests/integration/targets/icinga/runme.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

set -eux

ansible-playbook t_systems_mms.ansible_collection_icinga.mms_standard -e "@../../integration_config.yml" "$@"
ansible-playbook t_systems_mms.ansible_collection_icinga.check_azure_oauth_token -e "@../../integration_config.yml" "$@"
ansible-playbook t_systems_mms.ansible_collection_icinga.check_gitlab_scheduler -e "@../../integration_config.yml" "$@"
ansible-playbook t_systems_mms.ansible_collection_icinga.check_https -e "@../../integration_config.yml" "$@"
ansible-playbook t_systems_mms.ansible_collection_icinga.check_json -e "@../../integration_config.yml" "$@"
ansible-playbook t_systems_mms.ansible_collection_icinga.check_json_azure_restapi -e "@../../integration_config.yml" "$@"
ansible-playbook t_systems_mms.ansible_collection_icinga.check_json_azure_restapi_resourcehealth -e "@../../integration_config.yml" "$@"
ansible-playbook t_systems_mms.ansible_collection_icinga.template_empty_host -e "@../../integration_config.yml" "$@"
ansible-playbook telekom_mms.ansible_collection_icinga.mms_standard -e "@../../integration_config.yml" "$@"
ansible-playbook telekom_mms.ansible_collection_icinga.check_azure_oauth_token -e "@../../integration_config.yml" "$@"
ansible-playbook telekom_mms.ansible_collection_icinga.check_gitlab_scheduler -e "@../../integration_config.yml" "$@"
ansible-playbook telekom_mms.ansible_collection_icinga.check_https -e "@../../integration_config.yml" "$@"
ansible-playbook telekom_mms.ansible_collection_icinga.check_json -e "@../../integration_config.yml" "$@"
ansible-playbook telekom_mms.ansible_collection_icinga.check_json_azure_restapi -e "@../../integration_config.yml" "$@"
ansible-playbook telekom_mms.ansible_collection_icinga.check_json_azure_restapi_resourcehealth -e "@../../integration_config.yml" "$@"
ansible-playbook telekom_mms.ansible_collection_icinga.template_empty_host -e "@../../integration_config.yml" "$@"

0 comments on commit bd801e0

Please sign in to comment.