Merge pull request #12 from sensor-freak/master

Add option to use ssl connection

README.md

@@ -7,9 +7,10 @@ To create a new database, specify the parameter ```--create```. This will drop a
 
 ```
 usage: csv-to-influxdb.py [-h] -i [INPUT] [-d [DELIMITER]] [-s [SERVER]]
-                          [-u [USER]] [-p [PASSWORD]] --dbname [DBNAME]
-                          [-m [METRICNAME]] [-tc [TIMECOLUMN]]
-                          [-tf [TIMEFORMAT]] [--fieldcolumns [FIELDCOLUMNS]]
+                          [--ssl] [-u [USER]] [-p [PASSWORD]] --dbname
+                          [DBNAME] [--create] [-m [METRICNAME]]
+                          [-tc [TIMECOLUMN]] [-tf [TIMEFORMAT]] [-tz TIMEZONE]
+                          [--fieldcolumns [FIELDCOLUMNS]]
                           [--tagcolumns [TAGCOLUMNS]] [-g] [-b BATCHSIZE]
 
 Csv to influxdb.
@@ -22,6 +23,7 @@ optional arguments:
                         Csv delimiter. Default: ','.
   -s [SERVER], --server [SERVER]
                         Server address. Default: localhost:8086
+  --ssl                 Use HTTPS instead of HTTP.
   -u [USER], --user [USER]
                         User name.
   -p [PASSWORD], --password [PASSWORD]
@@ -35,6 +37,8 @@ optional arguments:
   -tf [TIMEFORMAT], --timeformat [TIMEFORMAT]
                         Timestamp format. Default: '%Y-%m-%d %H:%M:%S' e.g.:
                         1970-01-01 00:00:00
+  -tz TIMEZONE, --timezone TIMEZONE
+                        Timezone of supplied data. Default: UTC
   --fieldcolumns [FIELDCOLUMNS]
                         List of csv columns to use as fields, separated by
                         comma, e.g.: value1,value2. Default: value
@@ -45,7 +49,6 @@ optional arguments:
   -b BATCHSIZE, --batchsize BATCHSIZE
                         Batch size. Default: 5000.
 
-
 ```
 
 ## Example

csv-to-influxdb.py

@@ -47,11 +47,11 @@ def isinteger(value):
 
 def loadCsv(inputfilename, servername, user, password, dbname, metric, 
     timecolumn, timeformat, tagcolumns, fieldcolumns, usegzip, 
-    delimiter, batchsize, create, datatimezone):
+    delimiter, batchsize, create, datatimezone, usessl):
 
     host = servername[0:servername.rfind(':')]
     port = int(servername[servername.rfind(':')+1:])
-    client = InfluxDBClient(host, port, user, password, dbname)
+    client = InfluxDBClient(host, port, user, password, dbname, ssl=usessl)
 
     if(create == True):
         print('Deleting database %s'%dbname)
@@ -148,6 +148,9 @@ if __name__ == "__main__":
     parser.add_argument('-s', '--server', nargs='?', default='localhost:8086',
                         help='Server address. Default: localhost:8086')
 
+    parser.add_argument('--ssl', action='store_true', default=False,
+                        help='Use HTTPS instead of HTTP.')
+
     parser.add_argument('-u', '--user', nargs='?', default='root',
                         help='User name.')
 
@@ -188,4 +191,4 @@ if __name__ == "__main__":
     loadCsv(args.input, args.server, args.user, args.password, args.dbname, 
         args.metricname, args.timecolumn, args.timeformat, args.tagcolumns, 
         args.fieldcolumns, args.gzip, args.delimiter, args.batchsize, args.create, 
-        args.timezone)
+        args.timezone, args.ssl)