Merge pull request #3089 from project-sunbird/release-4.4.1

Release 4.4.1

ansible/roles/cassandra/tasks/main.yml

@@ -79,6 +79,24 @@
     delay: 10
     sleep: 5
 
+- name: Make sure systemd destination dir exists
+  file:
+    path: "/etc/systemd/system/cassandra.service.d"
+    state: directory
+    mode: "755"
+
+- name: Copy specific cassandra Systemd config file
+  template:
+    src: "override.conf.j2"
+    dest: "/etc/systemd/system/cassandra.service.d/override.conf"
+    owner: root
+    group: cassandra
+    mode: "644"
+    force: yes
+
+- name: Force systemd to reread configs
+  systemd: daemon_reload=yes    
+    
 - name: Restart Cassandra seeds
   service:
     name: cassandra

ansible/roles/cassandra/templates/override.conf.j2

+[Service]
+Environment="_JAVA_OPTIONS='-Dlog4j2.formatMsgNoLookups=true'"

ansible/roles/es6/templates/systemd/elasticsearch.j2

@@ -5,6 +5,7 @@ Wants=network-online.target
 After=network-online.target
 
 [Service]
+Environment="_JAVA_OPTIONS='-Dlog4j2.formatMsgNoLookups=true'"
 Environment=ES_HOME={{es_home}}
 Environment=CONF_DIR={{conf_dir}}
 Environment=ES_PATH_CONF={{conf_dir}}

ansible/roles/graylog/tasks/server.yml

@@ -40,6 +40,15 @@
     mode: 0644
   notify: "restart graylog-server"
 
+- name: "Add log4j env to service file"
+  lineinfile:
+    path: /usr/lib/systemd/system/graylog-server.service
+    insertafter: \[Service]
+    line: "Environment=\"_JAVA_OPTIONS='-Dlog4j2.formatMsgNoLookups=true'\""
+    firstmatch: yes
+    state: present
+  notify: "restart graylog-server"
+
 - name: "Graylog server should start after reboot"
   file:
     path: "/etc/init/graylog-server.override"

ansible/roles/graylog/templates/mongodb.service-Debian.j2

@@ -4,6 +4,7 @@ After=network.target
 Documentation=https://docs.mongodb.org/manual
 
 [Service]
+Environment="_JAVA_OPTIONS='-Dlog4j2.formatMsgNoLookups=true'"
 User=mongodb
 Group=mongodb
 ExecStart=/usr/bin/mongod --quiet --config /etc/mongod.conf

ansible/roles/graylog/templates/mongodb.service-RedHat.j2

@@ -4,6 +4,7 @@ After=network.target
 Documentation=https://docs.mongodb.org/manual
 
 [Service]
+Environment="_JAVA_OPTIONS='-Dlog4j2.formatMsgNoLookups=true'"
 User=mongod
 Group=mongod
 Environment="OPTIONS=-f /etc/mongod.conf"

ansible/roles/keycloak-provision/templates/keycloak-service.j2

@@ -11,7 +11,7 @@
 
 keycloakuser=keycloak
 keycloakpath=/opt/keycloak/bin
-
+_JAVA_OPTIONS='-Dlog4j2.formatMsgNoLookups=true'
 # Normal output log
 LOGOUT=/var/log/keycloak.out.log
 # Error output log

ansible/roles/log-es6/files/systemd/elasticsearch_override.conf

 [Service]
+Environment="_JAVA_OPTIONS='-Dlog4j2.formatMsgNoLookups=true'"
 LimitMEMLOCK=infinity

ansible/roles/log-es6/tasks/elasticsearch-config.yml

@@ -103,3 +103,13 @@
     force: yes
   notify: restart elasticsearch
   when: es_config_log4j2 != ''
+ 
+- name: Add log4j env to service file
+  become: yes
+  lineinfile:
+    path: /usr/lib/systemd/system/elasticsearch.service
+    insertafter: \[Service]
+    line: "Environment=\"_JAVA_OPTIONS='-Dlog4j2.formatMsgNoLookups=true'\""
+    firstmatch: yes
+    state: present
+  notify: restart elasticsearch

ansible/roles/log-es6/templates/elasticsearch.j2

@@ -8,6 +8,8 @@ ES_HOME={{es_home}}
 # Elasticsearch temp directory
 ES_TMPDIR={{ es_tmp_dir }}
 
+_JAVA_OPTIONS='-Dlog4j2.formatMsgNoLookups=true'
+
 # Elasticsearch Java path
 {% if es_java_home | length > 0 %}
 ES_JAVA_HOME={{ es_java_home }}

ansible/roles/log-es6/templates/override.conf.j2

 [Service]
+Environment="_JAVA_OPTIONS='-Dlog4j2.formatMsgNoLookups=true'"
 {% if m_lock_enabled %}
 LimitMEMLOCK = infinity
 {% endif %}
 {% if es_max_open_files is defined %}
 LimitNOFILE = {{ es_max_open_files }}
-{% endif %}
\ No newline at end of file
+{% endif %}

ansible/roles/logstash/templates/logstash.service.j2

@@ -2,6 +2,7 @@
 Description=logstash Daemon
 
 [Service]
+Environment="_JAVA_OPTIONS='-Dlog4j2.formatMsgNoLookups=true'"
 Type=simple
 User={{learner_user}}
 Group={{learner_user}}

ansible/roles/mongodb-cluster/templates/mongodb.service.j2

@@ -5,6 +5,7 @@ Documentation=man:mongod(1)
 After=network-online.target
 
 [Service]
+Environment="_JAVA_OPTIONS='-Dlog4j2.formatMsgNoLookups=true'"
 User={{ mongodb_user }}
 {% if mongodb_use_numa | bool %}
 ExecStart=/usr/bin/numactl --interleave=all /usr/bin/mongod --config /etc/mongod.conf