Skip to content

Commit 16f98fa

Browse files
committed
Change namespace to 'netways'
1 parent b2ce676 commit 16f98fa

File tree

32 files changed

+89
-111
lines changed

32 files changed

+89
-111
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-latest
2525

2626
env:
27-
COLLECTION_NAMESPACE: icinga
27+
COLLECTION_NAMESPACE: netways
2828
COLLECTION_NAME: icinga
2929

3030
strategy:

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
publish:
1414
runs-on: ubuntu-latest
1515
env:
16-
COLLECTION_NAMESPACE: icinga
16+
COLLECTION_NAMESPACE: netways
1717
COLLECTION_NAME: icinga
1818
steps:
1919
- uses: actions/checkout@v4

.github/workflows/role-icingadb.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ubuntu-latest
2727

2828
env:
29-
COLLECTION_NAMESPACE: icinga
29+
COLLECTION_NAMESPACE: netways
3030
COLLECTION_NAME: icinga
3131

3232
strategy:

.github/workflows/role-icingadb_redis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ubuntu-latest
2727

2828
env:
29-
COLLECTION_NAMESPACE: icinga
29+
COLLECTION_NAMESPACE: netways
3030
COLLECTION_NAME: icinga
3131

3232
strategy:

.github/workflows/role-icingaweb2.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ubuntu-latest
2727

2828
env:
29-
COLLECTION_NAMESPACE: icinga
29+
COLLECTION_NAMESPACE: netways
3030
COLLECTION_NAME: icinga
3131

3232
strategy:

.github/workflows/test_icingaweb2_ini_template.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-latest
2525

2626
env:
27-
COLLECTION_NAMESPACE: icinga
27+
COLLECTION_NAMESPACE: netways
2828
COLLECTION_NAME: icinga
2929

3030
strategy:
@@ -67,7 +67,7 @@ jobs:
6767
runs-on: ubuntu-latest
6868

6969
env:
70-
COLLECTION_NAMESPACE: icinga
70+
COLLECTION_NAMESPACE: netways
7171
COLLECTION_NAME: icinga
7272

7373
strategy:
@@ -110,7 +110,7 @@ jobs:
110110
runs-on: ubuntu-latest
111111

112112
env:
113-
COLLECTION_NAMESPACE: icinga
113+
COLLECTION_NAMESPACE: netways
114114
COLLECTION_NAME: icinga
115115

116116
strategy:

CONTRIBUTING.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Contributing
2-
A roadmap of this project is located at https://github.com/Icinga/ansible-collection-icinga/milestones. Please consider
2+
A roadmap of this project is located at https://github.com/NETWAYS/ansible-collection-icinga/milestones. Please consider
33
this roadmap when you start contributing to the project.
44

55
Before starting your work on this module, you should [fork the project] to your GitHub account. This allows you to
@@ -23,10 +23,6 @@ bugfixes:
2323
- Fixes issue with something that was caused by something else
2424
```
2525
26-
## Signing our CLA
27-
28-
When creating a Pull Request (PR) within one of our projects on GitHub, you will be automatically asked to sign our [CLA]. You only have to sign the [CLA] once and it will apply to all of our projects.
29-
3026
## Branches
3127
Choosing a proper name for a branch helps us identify its purpose and possibly find an associated bug or feature.
3228
Generally a branch name should include a topic such as `fix` or `feature` followed by a description and an issue number
@@ -46,5 +42,4 @@ tests as well.
4642
[fork the project]: https://help.github.com/articles/fork-a-repo/
4743
[pull request]: https://help.github.com/articles/using-pull-requests/
4844
[Molecule]: https://github.com/ansible-community/molecule/
49-
[CLA]: https://icinga.com/company/contributor-agreement/
5045
[Ansible Changelogs Fragments]: https://docs.ansible.com/ansible/latest/dev_guide/developing_collections_changelogs.html

PUBLISH.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
To avoid having leftover files from your local directory end up in the release, please **cleanly clone the release branch to another directory**.<br>
1313
```bash
14-
git clone --branch release/<VERSION> [email protected]:Icinga/ansible-collection-icinga.git release_<VERSION>
14+
git clone --branch release/<VERSION> [email protected]:NETWAYS/ansible-collection-icinga.git release_<VERSION>
1515
cd release_<VERSION>
1616
```
1717
You now only have files that were actually commmited.<br>
@@ -51,17 +51,17 @@
5151

5252
Push to Ansible Galaxy:<br>
5353
```bash
54-
ansible-galaxy collection publish --token <TOKEN> icinga-icinga-<VERSION>.tar.gz
54+
ansible-galaxy collection publish --token <TOKEN> netways-icinga-<VERSION>.tar.gz
5555
```
5656
> This might show errors which does **not** necessarily mean that it failed.<br>
57-
> Have a look at [Ansible Galaxy](https://galaxy.ansible.com/ui/repo/published/icinga/icinga/) and confirm if the release could be published.
57+
> Have a look at [Ansible Galaxy](https://galaxy.ansible.com/ui/repo/published/netways/icinga/) and confirm if the release could be published.
5858
5959
6. **Create a release on GitHub:**<br>
60-
When [creating a new release](https://github.com/Icinga/ansible-collection-icinga/releases/new)<br>
60+
When [creating a new release](https://github.com/NETWAYS/ansible-collection-icinga/releases/new)<br>
6161

6262
- choose \<VERSION\> as tag
6363
- choose the branch "release/\<VERSION\>" as target (will be tagged)
6464
- choose \<VERSION\> as title
65-
- copy and paste the release's changelog entry (see [prior releases](https://github.com/Icinga/ansible-collection-icinga/releases))
66-
- attach the created tar ball (icinga-icinga-\<VERSION\>.tar.gz) to the release
65+
- copy and paste the release's changelog entry (see [prior releases](https://github.com/NETWAYS/ansible-collection-icinga/releases))
66+
- attach the created tar ball (netways-icinga-\<VERSION\>.tar.gz) to the release
6767
- if you feel extra nice, credit contributors by adding their names, e.g. behind the respective issue or feature (`@name`)

README.md

Lines changed: 14 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,34 @@
11
# ansible-collection-icinga
22

3-
[![CI](https://github.com/Icinga/ansible-collection-icinga/workflows/Build/badge.svg?event=push)](https://github.com/Icinga/ansible-collection-icinga/actions/workflows/build.yml/badge.svg)
4-
[![PythonUnit](https://github.com/Icinga/ansible-collection-icinga/workflows/Python%20Unittest/badge.svg?event=push)](https://github.com/Icinga/ansible-collection-icinga/actions/workflows/python-test.yml/badge.svg)
5-
63
Collection to setup and manage components of the Icinga software stack.
74

85
## Documentation and Roles
96
* [Getting Started](doc/getting-started.md)
10-
* [Role: icinga.icinga.repos](doc/role-repos/role-repos.md)
11-
* [Role: icinga.icinga.icinga2](doc/role-icinga2/role-icinga2.md)
7+
* [Role: netways.icinga.repos](doc/role-repos/role-repos.md)
8+
* [Role: netways.icinga.icinga2](doc/role-icinga2/role-icinga2.md)
129
* [Parser and Monitoring Objects](doc/role-icinga2/objects.md)
1310
* [Features](doc/role-icinga2/features.md)
14-
* [Role: icinga.icinga.icingadb](doc/role-icingadb/role-icingadb.md)
15-
* [Role: icinga.icinga.icingadb_redis](doc/role-icingadb_redis/role-icingadb_redis.md)
16-
* [Role: icinga.icinga.icingaweb2](doc/role-icingaweb2/role-icingaweb2.md)
17-
* [Role: icinga.icinga.monitoring_plugins](doc/role-monitoring_plugins/role-monitoring_plugins.md)
11+
* [Role: netways.icinga.icingadb](doc/role-icingadb/role-icingadb.md)
12+
* [Role: netways.icinga.icingadb_redis](doc/role-icingadb_redis/role-icingadb_redis.md)
13+
* [Role: netways.icinga.icingaweb2](doc/role-icingaweb2/role-icingaweb2.md)
14+
* [Role: netways.icinga.monitoring_plugins](doc/role-monitoring_plugins/role-monitoring_plugins.md)
1815
* [List of Available Check Commands](doc/role-monitoring_plugins/check_command_list.md)
19-
* [Inventory Plugin: icinga.icinga.icinga](doc/plugins/inventory/icinga-inventory-plugin.md)
16+
* [Inventory Plugin: netways.icinga.icinga](doc/plugins/inventory/icinga-inventory-plugin.md)
2017

2118

2219
## Installation
2320

2421
You can easily install the collection with the `ansible-galaxy` command.
2522

2623
```bash
27-
ansible-galaxy collection install icinga.icinga
24+
ansible-galaxy collection install netways.icinga
2825
```
2926

3027
Or if you are using Tower or AWX add the collection to your requirements file.
3128

3229
```yaml
3330
collections:
34-
- name: icinga.icinga
31+
- name: netways.icinga
3532
```
3633
3734
## Usage
@@ -41,25 +38,9 @@ To use the collection in your playbooks, add the collection and then use the rol
4138
```yaml
4239
- hosts: icinga-server
4340
roles:
44-
- icinga.icinga.repos
45-
- icinga.icinga.icinga2
46-
- icinga.icinga.icingadb
47-
- icinga.icinga.icingadb_redis
48-
- icinga.icinga.monitoring_plugins
41+
- netways.icinga.repos
42+
- netways.icinga.icinga2
43+
- netways.icinga.icingadb
44+
- netways.icinga.icingadb_redis
45+
- netways.icinga.monitoring_plugins
4946
```
50-
51-
## License
52-
53-
Copyright 2023 Icinga GmbH
54-
55-
Licensed under the Apache License, Version 2.0 (the "License");
56-
you may not use this file except in compliance with the License.
57-
You may obtain a copy of the License at
58-
59-
http://www.apache.org/licenses/LICENSE-2.0
60-
61-
Unless required by applicable law or agreed to in writing, software
62-
distributed under the License is distributed on an "AS IS" BASIS,
63-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
64-
See the License for the specific language governing permissions and
65-
limitations under the License.

doc/getting-started.md

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ The collection includes six roles in the current version.
44

55
* icinga.repos: Role to manage repositories
66
* [Documentation: doc/role-repos](role-repos/role-repos.md)
7-
* icinga.icinga2: Role to install and manage Icinga 2 instances.
7+
* netways.icinga2: Role to install and manage Icinga 2 instances.
88
* [Documentation: doc/role-icinga2](role-icinga2/role-icinga2.md)
9-
* icinga.icingadb: Role to install and manage IcingaDB, Icinga2's new data backend.
9+
* netways.icingadb: Role to install and manage IcingaDB, Icinga2's new data backend.
1010
* [Documentation: doc/role-icingadb](role-icingadb/role-icingadb.md)
11-
* icinga.icingadb_redis: Role to install and manage Redis, IcingaDB's cache backend.
11+
* netways.icingadb_redis: Role to install and manage Redis, IcingaDB's cache backend.
1212
* [Documentation: doc/role-icingadb_redis](role-icingadb_redis/role-icingadb_redis.md)
13-
* icinga.icingaweb2: Role to install and manage Icinga Web 2.
13+
* netways.icingaweb2: Role to install and manage Icinga Web 2.
1414
* [Documentation: doc/role-icingaweb2](role-icingaweb2/role-icingaweb2.md)
1515
* icinga.monitoring_plugins: Role to install and manage Icinga2 compatible monitoring plugins.
1616
* [Documentation: doc/role-monitoring_plugins](role-monitoring_plugins/role-monitoring_plugins.md)
@@ -19,7 +19,7 @@ The collection includes six roles in the current version.
1919

2020
The collection includes a plugin that allows you to use Icinga as an inventory source for Ansible.
2121

22-
* icinga.icinga.icinga: Ansible Inventory Plugin to fetch hosts from Icinga.
22+
* netways.icinga.icinga: Ansible Inventory Plugin to fetch hosts from Icinga.
2323
* [Documentation: doc/plugins/inventory/icinga-inventory-plugin.md](plugins/inventory/icinga-inventory-plugin.md)
2424

2525
---
@@ -50,7 +50,7 @@ If you need to use become for a specific role only, you can add the following st
5050
become: false
5151
hosts: all
5252
roles:
53-
- name: icinga.icinga.icinga2
53+
- name: netways.icinga.icinga2
5454
become: true
5555
- some_other_role_without_become
5656
- name: explicit_no_become
@@ -65,20 +65,20 @@ To start with the collection, easily install it with the **ansible-galaxy** comm
6565
Installation from Galaxy Server:
6666
6767
```bash
68-
ansible-galaxy collection install icinga.icinga
68+
ansible-galaxy collection install netways.icinga
6969
```
7070

7171
Or pull the collection from the git. (Only useable with Ansible version 2.10.9)
7272
```bash
73-
ansible-galaxy collection install git+https://github.com/Icinga/ansible-collection-icinga.git,0.3.0
73+
ansible-galaxy collection install git+https://github.com/NETWAYS/ansible-collection-icinga.git,0.4.0
7474
```
7575

7676
Pre 2.10 you can also clone the repository, manually build and install the collection.
7777

7878
```bash
79-
git clone https://github.com/Icinga/ansible-collection-icinga.git
80-
ansible-galaxy collection build ansible-collection-icinga
81-
ansible-galaxy collection install icinga-icinga-0.3.0.tar.gz
79+
git clone https://github.com/NETWAYS/ansible-collection-icinga.git
80+
ansible-galaxy collection build
81+
ansible-galaxy collection install netways-icinga-0.4.0.tar.gz
8282
```
8383

8484
## Databases
@@ -155,8 +155,8 @@ This is an example on how to install an Icinga 2 server/master instance.
155155
severity: information
156156

157157
roles:
158-
- icinga.icinga.repos
159-
- icinga.icinga.icinga2
158+
- netways.icinga.repos
159+
- netways.icinga.icinga2
160160
```
161161
162162
This is an example on how to install an Icinga 2 agent instance.
@@ -183,8 +183,8 @@ This is an example on how to install an Icinga 2 agent instance.
183183
state: absent
184184

185185
roles:
186-
- icinga.icinga.repos
187-
- icinga.icinga.icinga2
186+
- netways.icinga.repos
187+
- netways.icinga.icinga2
188188
```
189189
190190
This is a example on how to install Icinga 2 server with Icinga Web 2 and Icinga DB.
@@ -246,18 +246,18 @@ This is a example on how to install Icinga 2 server with Icinga Web 2 and Icinga
246246
- "{{ ansible_fqdn }}"
247247
pre_tasks:
248248
- ansible.builtin.include_role:
249-
name: icinga.icinga.repos
249+
name: netways.icinga.repos
250250
# Geerlingguy mysql role to configure the databases.
251251
- ansible.builtin.include_role:
252252
name: geerlingguy.mysql
253253
- ansible.builtin.include_role:
254-
name: icinga.icinga.icinga2
254+
name: netways.icinga.icinga2
255255
- ansible.builtin.include_role:
256-
name: icinga.icinga.icingadb
256+
name: netways.icinga.icingadb
257257
- ansible.builtin.include_role:
258-
name: icinga.icinga.icingadb_redis
258+
name: netways.icinga.icingadb_redis
259259

260260
post_tasks:
261261
- ansible.builtin.include_role:
262-
name: icinga.icinga.icingaweb2
262+
name: netways.icinga.icingaweb2
263263
```

doc/plugins/inventory/icinga-inventory-plugin.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Example:
1818

1919
```yaml
2020
---
21-
plugin: icinga.icinga.icinga
21+
plugin: netways.icinga.icinga
2222
user: api-user
2323
password: api-user-password
2424
```
@@ -262,7 +262,7 @@ This inventory plugin needs
262262
This is a token that ensures that the plugin definitions are meant for this inventory plugin.<br>
263263
The form is `namespace.collection_name.plugin_name`.
264264

265-
This must be `icinga.icinga.icinga`
265+
This must be `netways.icinga.icinga`
266266

267267
Required: `true`<br>
268268
Type: `string`<br>
@@ -396,7 +396,7 @@ Example:
396396

397397
```yaml
398398
---
399-
plugin: icinga.icinga.icinga
399+
plugin: netways.icinga.icinga
400400
user: api-user
401401
password: api-user-password
402402

@@ -471,7 +471,7 @@ The following is an example on how to use the Ansible builtin cache plugin `json
471471

472472
```yaml
473473
---
474-
plugin: icinga.icinga.icinga
474+
plugin: netways.icinga.icinga
475475
user: api-user
476476
password: api-user-password
477477

@@ -522,7 +522,7 @@ Using the plugin:
522522

523523
```yaml
524524
---
525-
plugin: icinga.icinga.icinga
525+
plugin: netways.icinga.icinga
526526
user: api-user
527527
password: api-user-password
528528
@@ -580,7 +580,7 @@ Example:
580580

581581
```yaml
582582
---
583-
plugin: icinga.icinga.icinga
583+
plugin: netways.icinga.icinga
584584
user: api-user
585585
password: api-user-password
586586

doc/role-icinga2/role-icinga2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Role icinga.icinga.icinga2
1+
# Role netways.icinga.icinga2
22

33
The collection provides several roles to install and configure Icinga 2.
44

doc/role-icingadb/role-icingadb.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Role icinga.icinga.icingadb
1+
# Role netways.icinga.icingadb
22

33
This role installs and configures the IcingaDB daemon. In addition it can also import the schema into the database. It is idempotent and works in HA-setups (two Icinga2 instances).
44

@@ -99,7 +99,7 @@ This play installs IcingaDB with on the same host as its connected MysQL databas
9999
icingadb_database_type: mysql # needed by the schema import
100100

101101
roles:
102-
- role: icinga.icinga.icingadb
102+
- role: netways.icinga.icingadb
103103
```
104104
105105
This more complex example installs IcingaDB and connects it to a **remote** PostgreSQL database, using client certificates and TLS. It also imports the schema into the database. Redis is installed locally.
@@ -120,5 +120,5 @@ This more complex example installs IcingaDB and connects it to a **remote** Post
120120
icingadb_database_import_schema: true
121121

122122
roles:
123-
- role: icinga.icinga.icingadb
123+
- role: netways.icinga.icingadb
124124
```

0 commit comments

Comments
 (0)