Fix terminology in docs.

README.md

@@ -114,13 +114,13 @@ if you list the `checkmk.general` collection in the playbook's [`collections`](h
   tasks:
     - name: "Run activation."
       activation:
-        server_url: "http://my_server/"
-        site: "my_site"
-        automation_user: "my_user"
-        automation_secret: "my_secret"
+        server_url: "http://myserver/"
+        site: "mysite"
+        automation_user: "myuser"
+        automation_secret: "mysecret"
         force_foreign_changes: 'true'
         sites:
-          - "my_site"
+          - "mysite"
 ```
 ### More information about Checkmk
 

playbooks/vars/auth.yml

@@ -1,9 +1,9 @@
 ---
 # Provice the URL and credentials to your Checkmk site here #
-checkmk_var_server_url: "http://localhost/"
-checkmk_var_site: "my_site"
-checkmk_var_automation_user: "cmkadmin"
-checkmk_var_automation_secret: "cmk"
+checkmk_var_server_url: "http://myserver/"
+checkmk_var_site: "mysite"
+checkmk_var_automation_user: "myuser"
+checkmk_var_automation_secret: "mysecret"
 checkmk_agent_user: "{{ checkmk_var_automation_user }}"
 checkmk_agent_pass: "{{ checkmk_var_automation_secret }}"
 

playbooks/vars/config.yml.example

@@ -1,8 +1,8 @@
 ---
-checkmk_var_server_url: "http://localhost/"
-checkmk_var_site: "my_site"
-checkmk_var_automation_user: "automation"
-checkmk_var_automation_secret: "$SECRET"
+checkmk_var_server_url: "http://myserver/"
+checkmk_var_site: "mysite"
+checkmk_var_automation_user: "myuser"
+checkmk_var_automation_secret: "mysecret"
 
 checkmk_var_folders:
   - path: /test

plugins/lookup/folder.py

@@ -96,9 +96,9 @@
                     lookup('checkmk.general.folder',
                         '~tests',
                         server_url=my_server_url,
-                        site=my_site,
-                        automation_user=my_user,
-                        automation_secret=my_secret,
+                        site=mysite,
+                        automation_user=myuser,
+                        automation_secret=mysecret,
                         validate_certs=False
                         )
                  }}"

plugins/lookup/folders.py

@@ -110,9 +110,9 @@
         show_hosts=False,
         recursive=True,
         server_url=my_server_url,
-        site=my_site,
-        automation_user=my_user,
-        automation_secret=my_secret,
+        site=mysite,
+        automation_user=myuser,
+        automation_secret=mysecret,
         validate_certs=False
         )
     }}"
@@ -129,9 +129,9 @@
                      show_hosts=True,
                      recursive=True,
                      server_url=my_server_url,
-                     site=my_site,
-                     automation_user=my_user,
-                     automation_secret=my_secret,
+                     site=mysite,
+                     automation_user=myuser,
+                     automation_secret=mysecret,
                      validate_certs=False
                      )
               }}"

plugins/lookup/host.py

@@ -103,9 +103,9 @@
                         'example.com',
                         effective_attributes=True,
                         server_url=my_server_url,
-                        site=my_site,
-                        automation_user=my_user,
-                        automation_secret=my_secret,
+                        site=mysite,
+                        automation_user=myuser,
+                        automation_secret=mysecret,
                         validate_certs=False
                         )
                  }}"

plugins/lookup/hosts.py

@@ -98,9 +98,9 @@
     lookup('checkmk.general.hosts',
         effective_attributes=True,
         server_url=my_server_url,
-        site=my_site,
-        automation_user=my_user,
-        automation_secret=my_secret,
+        site=mysite,
+        automation_user=myuser,
+        automation_secret=mysecret,
         validate_certs=False
         )
     }}"

plugins/lookup/version.py

@@ -91,8 +91,8 @@
     version: "{{ lookup('checkmk.general.version',
                    server_url + '/' + site,
                    validate_certs=False,
-                   automation_user=my_user,
-                   automation_secret=my_secret
+                   automation_user=myuser,
+                   automation_secret=mysecret
                )}}"
 
 - name: "Use variables outside the module call."

plugins/modules/activation.py

@@ -46,35 +46,35 @@
 EXAMPLES = r"""
 - name: "Start activation on all sites."
   checkmk.general.activation:
-      server_url: "http://my_server/"
-      site: "my_site"
-      automation_user: "my_user"
-      automation_secret: "my_secret"
+      server_url: "http://myserver/"
+      site: "mysite"
+      automation_user: "myuser"
+      automation_secret: "mysecret"
   run_once: 'true'
 
 - name: "Start activation on a specific site."
   checkmk.general.activation:
-      server_url: "http://my_server/"
-      site: "my_site"
-      automation_user: "my_user"
-      automation_secret: "my_secret"
+      server_url: "http://myserver/"
+      site: "mysite"
+      automation_user: "myuser"
+      automation_secret: "mysecret"
       sites:
-          - "my_site"
+          - "mysite"
   run_once: 'true'
 
 - name: "Start activation including foreign changes."
   checkmk.general.activation:
-      server_url: "http://my_server/"
-      site: "my_site"
-      automation_user: "my_user"
-      automation_secret: "my_secret"
+      server_url: "http://myserver/"
+      site: "mysite"
+      automation_user: "myuser"
+      automation_secret: "mysecret"
       force_foreign_changes: 'true'
   run_once: 'true'
 
 - name: "Activate changes including foreign changes and wait for completion."
   checkmk.general.activation:
       server_url: "http://localhost/"
-      site: "my_site"
+      site: "mysite"
       automation_user: "automation"
       automation_secret: "$SECRET"
       redirect: 'true'

plugins/modules/bakery.py

@@ -47,28 +47,28 @@
 # Bake all agents without signing, as example in a fresh installation without a signature key.
 - name: "Bake all agents without signing."
   checkmk.general.bakery:
-    server_url: "http://my_server/"
-    site: "my_site"
-    automation_user: "my_user"
-    automation_secret: "my_secret"
+    server_url: "http://myserver/"
+    site: "mysite"
+    automation_user: "myuser"
+    automation_secret: "mysecret"
     state: "baked"
 # Sign all agents.
 - name: "Sign all agents."
   checkmk.general.bakery:
-    server_url: "http://my_server/"
-    site: "my_site"
-    automation_user: "my_user"
-    automation_secret: "my_secret"
+    server_url: "http://myserver/"
+    site: "mysite"
+    automation_user: "myuser"
+    automation_secret: "mysecret"
     signature_key_id: 1
     signature_key_passphrase: "secretkey"
     state: "signed"
 # Bake and sign all agents.
 - name: "Bake and sign all agents."
   checkmk.general.bakery:
-    server_url: "http://my_server/"
-    site: "my_site"
-    automation_user: "my_user"
-    automation_secret: "my_secret"
+    server_url: "http://myserver/"
+    site: "mysite"
+    automation_user: "myuser"
+    automation_secret: "mysecret"
     signature_key_id: 1
     signature_key_passphrase: "secretkey"
     state: "baked_signed"

plugins/modules/contact_group.py

@@ -58,10 +58,10 @@
 # Create a single contact group.
 - name: "Create a single contact group."
   checkmk.general.contact_group:
-    server_url: "http://my_server/"
-    site: "my_site"
-    automation_user: "my_user"
-    automation_secret: "my_secret"
+    server_url: "http://myserver/"
+    site: "mysite"
+    automation_user: "myuser"
+    automation_secret: "mysecret"
     name: "my_contact_group"
     title: "My Contact Group"
     customer: "provider"
@@ -70,10 +70,10 @@
 # Create several contact groups.
 - name: "Create several contact groups."
   checkmk.general.contact_group:
-    server_url: "http://my_server/"
-    site: "my_site"
-    automation_user: "my_user"
-    automation_secret: "my_secret"
+    server_url: "http://myserver/"
+    site: "mysite"
+    automation_user: "myuser"
+    automation_secret: "mysecret"
     customer: "provider"
     groups:
       - name: "my_contact_group_one"
@@ -87,10 +87,10 @@
 # Create several contact groups.
 - name: "Create several contact groups."
   checkmk.general.contact_group:
-    server_url: "http://my_server/"
-    site: "my_site"
-    automation_user: "my_user"
-    automation_secret: "my_secret"
+    server_url: "http://myserver/"
+    site: "mysite"
+    automation_user: "myuser"
+    automation_secret: "mysecret"
     customer: "provider"
     groups:
       - name: "my_contact_group_one"
@@ -102,20 +102,20 @@
 # Delete a single contact group.
 - name: "Create a single contact group."
   checkmk.general.contact_group:
-    server_url: "http://my_server/"
-    site: "my_site"
-    automation_user: "my_user"
-    automation_secret: "my_secret"
+    server_url: "http://myserver/"
+    site: "mysite"
+    automation_user: "myuser"
+    automation_secret: "mysecret"
     name: "my_contact_group"
     state: "absent"
 
 # Delete several contact groups.
 - name: "Delete several contact groups."
   checkmk.general.contact_group:
-    server_url: "http://my_server/"
-    site: "my_site"
-    automation_user: "my_user"
-    automation_secret: "my_secret"
+    server_url: "http://myserver/"
+    site: "mysite"
+    automation_user: "myuser"
+    automation_secret: "mysecret"
     groups:
       - name: "my_contact_group_one"
       - name: "my_contact_group_two"

plugins/modules/discovery.py

@@ -63,34 +63,34 @@
 # Create a single host.
 - name: "Add newly discovered services on host."
   checkmk.general.discovery:
-    server_url: "http://my_server/"
-    site: "my_site"
-    automation_user: "my_user"
-    automation_secret: "my_secret"
+    server_url: "http://myserver/"
+    site: "mysite"
+    automation_user: "myuser"
+    automation_secret: "mysecret"
     host_name: "my_host"
     state: "new"
 - name: "Add newly discovered services, update labels and remove vanished services on host."
   checkmk.general.discovery:
-    server_url: "http://my_server/"
-    site: "my_site"
-    automation_user: "my_user"
-    automation_secret: "my_secret"
+    server_url: "http://myserver/"
+    site: "mysite"
+    automation_user: "myuser"
+    automation_secret: "mysecret"
     host_name: "my_host"
     state: "fix_all"
 - name: "Add newly discovered services on hosts. (Bulk)"
   checkmk.general.discovery:
-    server_url: "http://my_server/"
-    site: "my_site"
-    automation_user: "my_user"
-    automation_secret: "my_secret"
+    server_url: "http://myserver/"
+    site: "mysite"
+    automation_user: "myuser"
+    automation_secret: "mysecret"
     hosts: ["my_host_0", "my_host_1"]
     state: "new"
 - name: "Add newly discovered services, update labels and remove vanished services on host; 3 at once (Bulk)"
   checkmk.general.discovery:
-    server_url: "http://my_server/"
-    site: "my_site"
-    automation_user: "my_user"
-    automation_secret: "my_secret"
+    server_url: "http://myserver/"
+    site: "mysite"
+    automation_user: "myuser"
+    automation_secret: "mysecret"
     hosts: ["my_host_0", "my_host_1", "my_host_2", "my_host_3", "my_host_4", "my_host_5"]
     state: "fix_all"
     bulk_size: 3

plugins/modules/downtime.py

@@ -94,7 +94,7 @@
 - name: "Schedule host downtime."
   checkmk.general.downtime:
     server_url: "{{ checkmk_var_server_url }}"
-    site: "{{ my_site }}"
+    site: "{{ mysite }}"
     automation_user: "{{ checkmk_var_automation_user }}"
     automation_secret: "{{ checkmk_var_automation_secret }}"
     host_name: my_host
@@ -107,7 +107,7 @@
 - name: "Schedule service downtimes for two given services."
   checkmk.general.downtime:
     server_url: "{{ checkmk_var_server_url }}"
-    site: "{{ my_site }}"
+    site: "{{ mysite }}"
     automation_user: "{{ checkmk_var_automation_user }}"
     automation_secret: "{{ checkmk_var_automation_secret }}"
     host_name: my_host
@@ -122,7 +122,7 @@
 - name: "Delete all service downtimes for two given services."
   checkmk.general.downtime:
     server_url: "{{ checkmk_var_server_url }}"
-    site: "{{ my_site }}"
+    site: "{{ mysite }}"
     automation_user: "{{ checkmk_var_automation_user }}"
     automation_secret: "{{ checkmk_var_automation_secret }}"
     host_name: my_host