Merge pull request #76 from Appdynamics/develop

Sync develop to master for 21.6 release

Author: v-zhuravlev

.ansible-lint

@@ -6,12 +6,12 @@ parseable: true
 quiet: true
 rulesdir:
   - ./rule/directory/
+#warn_list:
+# - X
 skip_list:
-  - '201'
-  - '204'
-  - '208'
-  - '303'
-  - '305'
   - unnamed-task
+  - var-naming
+  - risky-file-permissions
+  - command-instead-of-shell
 use_default_rules: true
 verbosity: 1

CHANGELOG.md

@@ -1,10 +1,12 @@
 
+# Changelog
 
-## Unreleased
+## 21.6
 
-### Bugfix
+### Fixed
 
-- Logger role: Fix for working in ansible 2.9.*
+- Logger role: Fixed role in ansible 2.9.* (https://github.com/Appdynamics/appdynamics-ansible/issues/71)
+- Dotnet role: Fixed automatic restart of IIS
 
 ## 21.4
 
@@ -26,4 +28,5 @@
 - DotNet agent logger 
 
 ### Removed
-### Changed
+### Updated
+### Fixed

roles/common/tasks/verify_lxml.yml

@@ -6,16 +6,16 @@
       name: lxml
     check_mode: yes
     ignore_errors: yes
-    register: lxmlStatus
+    register: lxml_status
     delegate_to: localhost
     changed_when: false
 
-  - debug: var=lxmlStatus
+  - debug: var=lxml_status
 
   - name: check lxml
     set_fact:
       lxml_found: True
-    when: lxmlStatus.stdout | regex_search('lxml==.*')
+    when: lxml_status.stdout | regex_search('lxml==.*')
 
   - name: Assert that lxml is installed on control node
     assert:

roles/db/tasks/install_db_agent_linux.yml

@@ -49,7 +49,7 @@
     - name: Kill running DB processes
       command: "kill {{ item }}"
       with_items: "{{ running_processes.stdout_lines }}"
-      ignore_errors: yes  # Skip 'kill: No such process' errors
+      ignore_errors: yes  # Skip 'kill: No such process' errors # noqa ignore-errors
       when: previous_db_agent.stat.exists
       changed_when: false
 

roles/dotnet/handlers/restart_iis.yml

@@ -9,5 +9,5 @@
     - { service: was, state: restarted }
     - { service: w3svc, state: started }
   listen: Restart app listener
-  ignore_errors: yes
+  ignore_errors: yes # noqa ignore-errors
   when: monitor_all_IIS_apps | bool and restart_app | bool and iis_service.exists

roles/dotnet/tasks/dotnet-agent.yml

@@ -32,15 +32,15 @@
     log_path: "{{ dotnet_agent_dest_folder_win }}/UninstallLogs.txt"
     state: absent
   when: is_agent_installed.stdout | length != 0
-  changed_when: false
+  tags: molecule-idempotence-notest
 
 - name: Remove the conf file # Since it does not update during installation
   win_file:
     path: "C:\\ProgramData\\AppDynamics\\DotNetAgent\\Config\\config.xml"
     state: absent
     force: true
   when: is_agent_installed.stdout | length != 0
-  changed_when: false
+  tags: molecule-idempotence-notest
 
 - block:
   - name: Install .NET agent service
@@ -53,7 +53,6 @@
     notify:
       - Verify .NET agent restart
       - Restart app listener
-    changed_when: false
   rescue:
     - name: Get log Winston.txt
       win_shell: 'Get-Content {{ DOTNETAGENTFOLDER }}\Logs\Winston.txt -Tail 30'
@@ -81,4 +80,4 @@
   win_file:
     path: "{{ dotnet_agent_dest_folder_win }}\\{{ dotnet_agent_dest_file }}"
     state: absent
-  changed_when: false
+  tags: molecule-idempotence-notest

roles/dotnetcore/tasks/dotnet-core-agent-linux.yml

@@ -78,7 +78,6 @@
         - agent_dir_permission.group is defined
         - agent_dir_permission.user | length != 0
         - agent_dir_permission.group | length != 0
-      ignore_errors: yes
       changed_when: false
 
     - name: Copy the environment variables shell script file to /etc/profile.d Directory

roles/java/tasks/java-agent-linux.yml

@@ -98,7 +98,6 @@
         recurse: yes
         owner: "{{ agent_dir_permission.user }}"
         group: "{{ agent_dir_permission.group }}"
-      ignore_errors: yes
       changed_when: false
 
     - name: "Make java agent log and conf dirs writable to {{ agent_dir_permission.user }} user and {{ agent_dir_permission.group }} group"
@@ -113,7 +112,6 @@
         - "{{ java_agent_ver_folder }}/logs"
         - "{{ java_agent_ver_folder }}/conf"
         - "{{ java_agent_dest_folder_linux }}/conf"
-      ignore_errors: yes
       changed_when: false
 
     - name: Clean up - remove {{ java_agent_dest_file }}

roles/logger/tasks/db_logger_linux.yaml

@@ -35,7 +35,7 @@
       tempfile:
         state: directory
         suffix: build
-      register: tempDir
+      register: temp_dir
       changed_when: false
 
     # Rather than modifying the XML files in-situ on the remote server, re copy
@@ -45,15 +45,15 @@
     - name: Copy the log4j file down to update it localy
       fetch:
         src: '{{ db_agent_dest_folder_linux }}/conf/logging/log4j.xml'
-        dest: '{{ tempDir.path }}/'
+        dest: '{{ temp_dir.path }}/'
         mode: 0755
         flat: yes
       changed_when: false
 
     - name: Check which xpath entries are found
       xml:
         # path: '{{ db_agent_dest_folder_linux }}/conf/logging/log4j.xml'
-        path: '{{ tempDir.path }}/log4j.xml'
+        path: '{{ temp_dir.path }}/log4j.xml'
         xpath: //logger[@name='{{ item }}']/level
         count: yes
       register: hits
@@ -63,7 +63,7 @@
     - name: Set the log DB level for all relevant loggers
       xml:
         # path: '{{ db_agent_dest_folder_linux }}/conf/logging/log4j.xml'
-        path: '{{ tempDir.path }}/log4j.xml'
+        path: '{{ temp_dir.path }}/log4j.xml'
         xpath: "{{ item.actions.xpath }}" # //logger[@name='{{ item }}']/level
         attribute: value
         value: "{{ agent_log_level }}"
@@ -78,13 +78,13 @@
     - name: Copy the local file back to the host
       become: true
       copy:
-         src: '{{ tempDir.path }}/log4j.xml'
+         src: '{{ temp_dir.path }}/log4j.xml'
          dest: '{{ db_agent_dest_folder_linux }}/conf/logging/log4j.xml'
       changed_when: false
 
     - name: Delete the temp directory
       file:
-         path: "{{ tempDir.path }}"
+         path: "{{ temp_dir.path }}"
          state: absent
       delegate_to: localhost
       changed_when: false

roles/logger/tasks/java_logger_linux.yaml

@@ -33,7 +33,7 @@
     tempfile:
       state: directory
       suffix: build
-    register: tempDir
+    register: temp_dir
     changed_when: false
 
   # Rather than modifying the XML files in-situ on the remote server, we copy
@@ -43,15 +43,15 @@
   - name: Copy the log4j file down to update it localy ( which we do as not to require the lxml python library on the target )
     fetch:
       src: '{{ java_agent_ver_folder }}/conf/logging/log4j2.xml'
-      dest: '{{ tempDir.path }}/'
+      dest: '{{ temp_dir.path }}/'
       mode: 0755
       flat: yes
     changed_when: false
 
   - name: Check which xpath entries are found in the log4j2 file
     xml:
       # path: '{{ java_agent_ver_folder }}/conf/logging/log4j2.xml'
-      path: '{{ tempDir.path }}/log4j2.xml'
+      path: '{{ temp_dir.path }}/log4j2.xml'
       xpath: //AsyncLogger[@name='{{ item }}']
       count: yes
     register: hits
@@ -61,7 +61,7 @@
   - name: Set the log level for the java agent
     xml:
       # path: '{{ java_agent_ver_folder }}/conf/logging/log4j2.xml'
-      path: '{{ tempDir.path }}/log4j2.xml'
+      path: '{{ temp_dir.path }}/log4j2.xml'
       xpath: "{{ item.actions.xpath }}" #  //AsyncLogger[@name='{{ item }}']
       attribute: level
       value: "{{ agent_log_level }}"
@@ -76,13 +76,13 @@
   - name: Copy the local file back to the host
     become: true
     copy:
-       src: '{{ tempDir.path }}/log4j2.xml'
+       src: '{{ temp_dir.path }}/log4j2.xml'
        dest: '{{ java_agent_ver_folder }}/conf/logging/'
     changed_when: false
 
   - name: Delete the temp directory
     file:
-       path: "{{ tempDir.path }}"
+       path: "{{ temp_dir.path }}"
        state: absent
     delegate_to: localhost
     changed_when: false

roles/logger/tasks/machine_logger_linux.yaml

@@ -19,21 +19,21 @@
     tempfile:
       state: directory
       suffix: build
-    register: tempDir
+    register: temp_dir
     changed_when: false
 
   - name: Copy the log4j file down to update it localy
     fetch:
       src: '{{ machine_agent_dest_folder_linux }}/conf/logging/log4j.xml'
-      dest: '{{ tempDir.path }}/'
+      dest: '{{ temp_dir.path }}/'
       mode: 0755
       flat: yes
     changed_when: false
 
   - name: Check which xpath entries are found in the log4j file
     xml:
       # path: '{{ machine_agent_dest_folder_linux }}/conf/logging/log4j.xml'
-      path: '{{ tempDir.path }}/log4j.xml'
+      path: '{{ temp_dir.path }}/log4j.xml'
       xpath: //Logger[@name='{{ item }}']
       count: yes
     register: hits
@@ -43,7 +43,7 @@
   - name: Set the log level for the machine agent
     xml:
       # path: '{{ machine_agent_dest_folder_linux }}/conf/logging/log4j.xml'
-      path: '{{ tempDir.path }}/log4j.xml'
+      path: '{{ temp_dir.path }}/log4j.xml'
       xpath: "{{ item.actions.xpath }}" # //Logger[@name='{{ item }}']
       attribute: level
       value: "{{ agent_log_level }}"
@@ -58,13 +58,13 @@
   - name: Copy the local file back to the host
     become: true
     copy:
-       src: '{{ tempDir.path }}/log4j.xml'
+       src: '{{ temp_dir.path }}/log4j.xml'
        dest: '{{ machine_agent_dest_folder_linux }}/conf/logging/log4j.xml'
     changed_when: false
 
   - name: Delete the temp directory
     file:
-       path: "{{ tempDir.path }}"
+       path: "{{ temp_dir.path }}"
        state: absent
     delegate_to: localhost
     changed_when: false

roles/machine/vars/main.yml

@@ -1,2 +0,0 @@
-# vars are propagated to dependencies (but defaults not)
-create_appdynamics_user: yes