Merge branch 'master' into retry_with_backoff

xginn8 · web-flow · commit e043b1e4f597 · 2017-10-25T20:14:01.000-04:00
diff --git a/influxdb/_dataframe_client.py b/influxdb/_dataframe_client.py
@@ -298,12 +298,6 @@ def _convert_dataframe_to_lines(self,
         field_columns = list(field_columns) if list(field_columns) else []
         tag_columns = list(tag_columns) if list(tag_columns) else []
 
-        # Make global_tags as tag_columns
-        if global_tags:
-            for tag in global_tags:
-                dataframe[tag] = global_tags[tag]
-                tag_columns.append(tag)
-
         # If field columns but no tag columns, assume rest of columns are tags
         if field_columns and (not tag_columns):
             tag_columns = list(column_series[~column_series.isin(
@@ -333,6 +327,13 @@ def _convert_dataframe_to_lines(self,
 
         # If tag columns exist, make an array of formatted tag keys and values
         if tag_columns:
+
+            # Make global_tags as tag_columns
+            if global_tags:
+                for tag in global_tags:
+                    dataframe[tag] = global_tags[tag]
+                    tag_columns.append(tag)
+
             tag_df = dataframe[tag_columns]
             tag_df = tag_df.fillna('')  # replace NA with empty string
             tag_df = tag_df.sort_index(axis=1)
@@ -345,6 +346,12 @@ def _convert_dataframe_to_lines(self,
             tags = tags.sum(axis=1)
 
             del tag_df
+        elif global_tags:
+            tag_string = ''.join(
+                [",{}={}".format(k, _escape_tag(v)) if v else ''
+                 for k, v in sorted(global_tags.items())]
+            )
+            tags = pd.Series(tag_string, index=dataframe.index)
         else:
             tags = ''
 
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -115,7 +115,7 @@ def __init__(self,
             self._port)
 
         self._headers = {
-            'Content-type': 'application/json',
+            'Content-Type': 'application/json',
             'Accept': 'text/plain'
         }
 
@@ -293,7 +293,7 @@ def write(self, data, params=None, expected_response_code=204,
         :rtype: bool
         """
         headers = self._headers
-        headers['Content-type'] = 'application/octet-stream'
+        headers['Content-Type'] = 'application/octet-stream'
 
         if params:
             precision = params.get('precision')
