Convert to reduced list of known types (#50010)

lib/ansible/modules/monitoring/circonus_annotation.py

@@ -88,7 +88,7 @@ annotation:
         _cid:
             description: annotation identifier
             returned: success
-            type: string
+            type: str
             sample: /annotation/100000
         _created:
             description: creation timestamp
@@ -103,22 +103,22 @@ annotation:
         _last_modified_by:
             description: last modified by
             returned: success
-            type: string
+            type: str
             sample: /user/1000
         category:
             description: category of the created annotation
             returned: success
-            type: string
+            type: str
             sample: alerts
         title:
             description: title of the created annotation
             returned: success
-            type: string
+            type: str
             sample: WARNING
         description:
             description: description of the created annotation
             returned: success
-            type: string
+            type: str
             sample: Host is down.
         start:
             description: timestamp, since annotation applies
@@ -128,7 +128,7 @@ annotation:
         stop:
             description: timestamp, since annotation ends
             returned: success
-            type: string
+            type: str
             sample: Host is down.
         rel_metrics:
             description: Array of metrics related to this annotation, each metrics is a string.

lib/ansible/modules/monitoring/grafana_dashboard.py

@@ -131,7 +131,7 @@ RETURN = '''
 uid:
   description: uid or slug of the created / deleted / exported dashboard.
   returned: success
-  type: string
+  type: str
   sample: 000000063
 '''
 

lib/ansible/modules/monitoring/grafana_datasource.py

@@ -305,7 +305,7 @@ RETURN = '''
 name:
   description: name of the datasource created.
   returned: success
-  type: string
+  type: str
   sample: test-ds
 id:
   description: Id of the datasource

lib/ansible/modules/monitoring/grafana_plugin.py

@@ -61,7 +61,7 @@ RETURN = '''
 ---
 version:
   description: version of the installed / removed plugin.
-  type: string
+  type: str
   returned: allways
 '''
 

lib/ansible/modules/monitoring/icinga2_host.py

@@ -113,7 +113,7 @@ EXAMPLES = '''
 RETURN = '''
 name:
     description: The name used to create, modify or delete the host
-    type: string
+    type: str
     returned: always
 data:
     description: The data structure used for create, modify or delete of the host

lib/ansible/modules/monitoring/logicmonitor.py

@@ -13,7 +13,7 @@ RETURN = '''
 success:
     description: flag indicating that execution was successful
     returned: success
-    type: boolean
+    type: bool
     sample: True
 ...
 '''

lib/ansible/modules/monitoring/sensu_client.py

@@ -139,7 +139,7 @@ config:
 file:
   description: Path to the client configuration file
   returned: success
-  type: string
+  type: str
   sample: "/etc/sensu/conf.d/client.json"
 '''
 

lib/ansible/modules/monitoring/sensu_handler.py

@@ -140,12 +140,12 @@ config:
 file:
   description: Path to the handler configuration file
   returned: success
-  type: string
+  type: str
   sample: "/etc/sensu/conf.d/handlers/irc.json"
 name:
   description: Name of the handler
   returned: success
-  type: string
+  type: str
   sample: "irc"
 '''
 

lib/ansible/modules/monitoring/zabbix/zabbix_action.py

@@ -385,7 +385,7 @@ RETURN = '''
 msg:
     description: The result of the operation
     returned: success
-    type: string
+    type: str
     sample: 'Action Deleted: Register webservers, ID: 0001'
 '''
 

lib/ansible/modules/monitoring/zabbix/zabbix_template.py

@@ -166,7 +166,7 @@ RETURN = '''
 template_json:
   description: The JSON dump of the template
   returned: when state is dump
-  type: string
+  type: str
   sample: {
         "zabbix_export":{
             "date":"2017-11-29T16:37:24Z",