diff --git a/lib/cli/cli.js b/lib/cli/cli.js
index 944fc88f4..1df338b2b 100644
--- a/lib/cli/cli.js
+++ b/lib/cli/cli.js
@@ -1304,11 +1304,29 @@ export async function parseCommandLine() {
       group: 'InfluxDB'
     })
     .option('influxdb.username', {
-      describe: 'The InfluxDB username for your InfluxDB instance.',
+      describe:
+        'The InfluxDB username for your InfluxDB instance (only for InfluxDB v1)',
       group: 'InfluxDB'
     })
     .option('influxdb.password', {
-      describe: 'The InfluxDB password for your InfluxDB instance.',
+      describe:
+        'The InfluxDB password for your InfluxDB instance (only for InfluxDB v1).',
+      group: 'InfluxDB'
+    })
+    .option('influxdb.organisation', {
+      describe:
+        'The InfluxDB organisation for your InfluxDB instance (only for InfluxDB v2)',
+      group: 'InfluxDB'
+    })
+    .option('influxdb.token', {
+      describe:
+        'The InfluxDB token for your InfluxDB instance (only for InfluxDB v2)',
+      group: 'InfluxDB'
+    })
+    .option('influxdb.version', {
+      default: 1,
+      describe: 'The InfluxDB version of your InfluxDB instance.',
+      type: 'integer',
       group: 'InfluxDB'
     })
     .option('influxdb.database', {
diff --git a/lib/plugins/influxdb/data-generator.js b/lib/plugins/influxdb/data-generator.js
index 57b0879ae..4ba4cad94 100644
--- a/lib/plugins/influxdb/data-generator.js
+++ b/lib/plugins/influxdb/data-generator.js
@@ -204,7 +204,6 @@ export class InfluxDBDataGenerator {
   }
 
   dataFromMessage(message, time, alias) {
-    console.log('GET DATA');
     function getTagsFromMessage(
       message,
       includeQueryParameters,