Add option for customizing rsyslog application log format

planb/cli.py

@@ -60,6 +60,7 @@ def cli(debug: bool):
 @click.option('--hosted-zone', help='create SRV records in this Hosted Zone')
 @click.option('--scalyr-region')
 @click.option('--scalyr-key')
+@click.option('--rsyslog-format')
 @click.option('--artifact-name', help='Pierone artifact name to use (default: planb-cassandra-3.0)')
 @click.option('--docker-image', help='Docker image to use (default: latest planb-cassandra-3.0)')
 @click.option('--environment', '-e', multiple=True)
@@ -79,6 +80,7 @@ def create(regions: list,
            hosted_zone: str,
            scalyr_region: str,
            scalyr_key: str,
+           rsyslog_format: str,
            artifact_name: str,
            docker_image: str,
            environment: list,
@@ -151,6 +153,7 @@ def extend(from_region: str,
 @click.option('--instance-type', type=str)
 @click.option('--scalyr-region')
 @click.option('--scalyr-key')
+@click.option('--rsyslog-format')
 @click.option('--environment', '-e', multiple=True)
 @click.option('--sns-topic', help=sns_topic_help)
 @click.option('--sns-email', help=sns_email_help)
@@ -164,6 +167,7 @@ def update(cluster_name: str,
            instance_type: str,
            scalyr_region: str,
            scalyr_key: str,
+           rsyslog_format: str,
            environment: list,
            sns_topic: str,
            sns_email: str):

planb/create_cluster.py

@@ -455,6 +455,9 @@ def generate_taupage_user_data(options: dict) -> str:
     if options['scalyr_region']:
         data['scalyr_region'] = options['scalyr_region']
 
+    if options['rsyslog_format']:
+        data['rsyslog_application_log_format'] = options['rsyslog_format']
+
     if options['environment']:
         data['environment'].update(options['environment'])
 

planb/update_cluster.py

@@ -266,6 +266,10 @@ def build_run_instances_params(
     if scalyr_key:
         user_data_changes['scalyr_account_key'] = scalyr_key
 
+    log_format = options.get('rsyslog_format')
+    if log_format:
+        user_data_changes['rsyslog_application_log_format'] = log_format
+
     params['UserData'].update(user_data_changes)
     return params
 

tests/test_update_cluster.py

@@ -57,7 +57,8 @@ def test_build_run_instances_params():
             'key2': 'value2'
         },
         'scalyr_region': 'eu',
-        'scalyr_key': 'new-shiny-scalyr-key'
+        'scalyr_key': 'new-shiny-scalyr-key',
+        'rsyslog_format': 'log-format'
     }
     expected = {
         'MinCount': 1,
@@ -87,7 +88,8 @@ def test_build_run_instances_params():
                 'key2': 'value2'
             },
             'scalyr_region': 'eu',
-            'scalyr_account_key': 'new-shiny-scalyr-key'
+            'scalyr_account_key': 'new-shiny-scalyr-key',
+            'rsyslog_application_log_format': 'log-format'
         }
     }
     actual = build_run_instances_params(ec2, saved_instance, options)