Merge pull request #8 from HoopadCorp/enhancement/filebeat.conf

Enhancement/filebeat.conf
HoopadCorp · Nov 28, 2022 · 422a7e0 · 422a7e0
2 parents 977c142 + 56b2160
commit 422a7e0
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/client-services/pnp-client/pnp-client.py b/client-services/pnp-client/pnp-client.py
@@ -19,8 +19,11 @@
                      {'module': 'netflow',
                       'log': {'enabled': True, 'var': {'netflow_host': '0.0.0.0', 'netflow_port': 2055}}}],
                  'output.elasticsearch': {
-                     'ssl.certificate_authorities': ['/usr/local/share/ca-certificates/WANPAD.crt'], 'hosts': 'ENV_ME',
-                     'username': 'ENV_ME', 'password': 'ENV_ME'}}
+                     'ssl.certificate_authorities': ['/usr/local/share/ca-certificates/WANPAD.crt'], 'hosts': 'ENV_ME'},
+                'setup.ilm.enabled': True,
+                 'setup.ilm.rollover_alias': 'filebeat', 'setup.ilm.pattern': '{now/d}-000001',
+                 'output.elasticsearch.index': 'filebeat-%{[agent.version]}-%{+yyyy.MM.dd}',
+                 'setup.template.name': 'filebeat', 'setup.template.pattern': 'filebeat-*'}
 
 
 def get_interfaces():
@@ -57,9 +60,8 @@ def client_program():
 
             filebeat = response.get('filebeat')
             filebeat_data['output.elasticsearch']['hosts'] = filebeat.get('hosts')
-            filebeat_data['output.elasticsearch']['username'] = filebeat.get('username')
-            filebeat_data['output.elasticsearch']['password'] = filebeat.get('password')
             filebeat_data['output.elasticsearch']['ssl.certificate_authorities'] = filebeat.get('ssl_crt')
+            filebeat_data['output.elasticsearch.api_key'] = f"{filebeat.get('id')}:{filebeat.get('api_key')}"
 
             create_file_beat(filebeat_data, filebeat.get('conf_address'))