diff --git a/global/overlay/etc/hiera/data/common.yaml b/global/overlay/etc/hiera/data/common.yaml
index 02288df3..59ffc044 100644
--- a/global/overlay/etc/hiera/data/common.yaml
+++ b/global/overlay/etc/hiera/data/common.yaml
@@ -76,3 +76,4 @@ redis_sentinel_ips:
 
 influxdb2_org: SwedenConnect
 influxdb2_bucket: eidas
+influxdb2_bucket_proxy: eidas-proxy
diff --git a/global/overlay/etc/puppet/modules/eid/manifests/telegraf.pp b/global/overlay/etc/puppet/modules/eid/manifests/telegraf.pp
index 2cd807c6..6511c6d3 100644
--- a/global/overlay/etc/puppet/modules/eid/manifests/telegraf.pp
+++ b/global/overlay/etc/puppet/modules/eid/manifests/telegraf.pp
@@ -42,7 +42,7 @@ class eid::telegraf(String $version = "stable", Array $volumes = [], Array $port
        imagetag  => "latest",
        volumes   => $_volumes,
        ports     => $ports,
-       env       => ["INFLUXDB2_TOKEN=$influxdb2_token","INFLUXDB2_ORG=$influxdb2_org","INFLUXDB2_BUCKET=$influxdb2_bucket","INFLUX2_TOKEN=$influx2_token"]
+       env       => ["INFLUXDB2_TOKEN=$influxdb2_token","INFLUXDB2_ORG=$influxdb2_org","INFLUXDB2_BUCKET=$influxdb2_bucket","INFLUXDB2_BUCKET_PROXY=$influxdb2_bucket_proxy","INFLUX2_TOKEN=$influx2_token"]
      }
    } else {
      sunet::docker_run {"telegraf":
@@ -51,7 +51,7 @@ class eid::telegraf(String $version = "stable", Array $volumes = [], Array $port
        imagetag  => $version,
        volumes   => $_volumes,
        ports     => $ports,
-       env       => ["INFLUXDB2_TOKEN=$influxdb2_token","INFLUXDB2_ORG=$influxdb2_org","INFLUXDB2_BUCKET=$influxdb2_bucket"]
+       env       => ["INFLUXDB2_TOKEN=$influxdb2_token","INFLUXDB2_ORG=$influxdb2_org","INFLUXDB2_BUCKET=$influxdb2_bucket","INFLUXDB2_BUCKET_PROXY=$influxdb2_bucket_proxy"]
      }
    }
 }
diff --git a/global/overlay/etc/puppet/modules/eid/templates/telegraf/95-telegraf.conf.erb b/global/overlay/etc/puppet/modules/eid/templates/telegraf/95-telegraf.conf.erb
index e6715eaf..c1660cbe 100644
--- a/global/overlay/etc/puppet/modules/eid/templates/telegraf/95-telegraf.conf.erb
+++ b/global/overlay/etc/puppet/modules/eid/templates/telegraf/95-telegraf.conf.erb
@@ -4,3 +4,14 @@
   organization = "$INFLUXDB2_ORG"
   bucket = "$INFLUXDB2_BUCKET"
   insecure_skip_verify = true
+  [outputs.influxdb_v2.tagdrop]
+    influxdb_database = ["*"]
+[[outputs.influxdb_v2]]
+  urls = ["https://influx-1.sunet.se:8086"]
+  token = "$INFLUX2_TOKEN"
+  organization = "$INFLUXDB2_ORG"
+  bucket = "$INFLUXDB2_BUCKET_PROXY"
+  insecure_skip_verify = true
+  tagexclude = ["influxdb_database"]
+  [outputs.influxdb_v2.tagpass]
+    influxdb_database = ["proxy"]
diff --git a/log.qa.sveidas.se/overlay/etc/hiera/data/local.eyaml b/log.qa.sveidas.se/overlay/etc/hiera/data/local.eyaml
index 5487d704..7227e3bd 100644
--- a/log.qa.sveidas.se/overlay/etc/hiera/data/local.eyaml
+++ b/log.qa.sveidas.se/overlay/etc/hiera/data/local.eyaml
@@ -5,6 +5,7 @@
 
 
 
+
 ---
 influxdb2_token: ENC[PKCS7,MIIDDQYJKoZIhvcNAQcDoIIC/jCCAvoCAQAxggJkMIICYAIBADBIMDsxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxDDAKBgNVBAMMA2xvZwIJAKJzqf9oYCsrMA0GCSqGSIb3DQEBAQUABIICAJhthCOUa3kJqtsYYIEqLTrXo2yMq0fATP28uTXTQv0VX53m46Htwazda2o2h10HaNK9Zf+WnrhJ3T/moJA4Dge/IA3bfSOt8fqKO+ms14gm+LSHV46H4TPbzcuxKW4Hg2PKKtpPJWKeEP8JETbiyWnV/t980ZeXmOq2z9C63Fa5IMzeMQf10bw++egKSubg6soURq079FIbiu6tkZfJ9krlhQKHEkb1YpuHIFgzfuYgm8XD6Jj/Lr7iwtz+aEXWCNWA1tmD+G7Nbrv7MWg+tBBRJXZS3NCfDXs3NfRqG1dHCgyMdQFMkKc+qKytAZWX3HvRiXELERFPA86iqcMdpjRhp+a++7x/O49pkhSrhGPmYfrCutUARxRablw336hGHHX/gYA1c9a1Ok+jCha+NySFtvVW4I2uGbL+HFqJ1HcJj+Nln7wjc3xFIhUtZjrzKO0k4hBBmDSFQC6Be/U7hG2kZyKVAS0tCr7/+GW75QDBIr+0dupPVvm+nf+uhEeAfzxi4rDiDUMRgWw37yv8sWyZCTXRkGbjw/b3wPeVuDhCTqn4RWwNBYaZHYGhlHx4tt0GKgR7ai4+JSsGXaOaSru0rWW6+S5G7xB6NvOGOnEhIaYD7+QkAio7gkBPrvCHG9XoCe0seeAattWsYO+/0VpjXiG9J9/8Vab2Hnf8YCIRMIGMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDvAD6BebaqttB7yd7OfCeAgGCVMV8yriGfJbXGuYisaR919oUWIw3fawDI06N/6qCWn1OUhkFW2wsJurw+rcEb+pM/7FN8WloZQF5s4G5xN6rbnBLYo4hPFlMlNC4iLeOgDzMCqJeU6C12U8t075i1XZc=]
-influx2_token: ENC[PKCS7,MIIDDQYJKoZIhvcNAQcDoIIC/jCCAvoCAQAxggJkMIICYAIBADBIMDsxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxDDAKBgNVBAMMA2xvZwIJAKJzqf9oYCsrMA0GCSqGSIb3DQEBAQUABIICABIOQqaPGKHzD8+exNIPIwSg/JiLxBYdk0i2wYJzzdRqu6e1gGgYFhweEfv0cRm8APhaU312U7kmuDeU0bAyd30ORvMLBA2C9yyg0wGZ8g+L98QJbnIi1eGQrMg/8M6Js7/yRvGEGm3CUopaNmMhcpdpGx5leZgNRM5cEe3v2/Cm5qZ4Yo6bjFTmE1y5Zwf9JljD8W6I3kouF7bjnC8oOeCHODDU0q3FuThGKQnG8gOAQDzR6I2LWzOQx32X5gcu0+t1HzGp5S7brt08roPpHMybiPiKjoMuxRfDtHH7MSn56jiPd67V9u2pk853+iDTuNoCcnSN2zVTqE5GkLJHGeQSrlePs54uijaMIZqcQUuNridj3rtQKh8H0MG/py11e3Gp9EeaEwvAdz56o4gha2zsHNmA9M/GE3eiqQ3TPTv1/mFCJ4ahs8qadcg/BQeGF/ZVJxUKB2X8/bbiiqmOF1vzbWk1zPoWZfI2ii7+yI9j88WPS/zm6qJ+8LW6phudrxvyGmMEyWiGXwrdUu/TwRZRUy9/mKWQPYNm7wXAyMkg7PT26C2WAu7aRrRNEZAZwaoDE1qqaPh+/WrTS4iL54rnFahvPSZPL3Li3OwUJRW/OD3WOjgT9Qp8k6pX7gAW7HFG5FtS3og2ZP0f8BxLC7oM28O+SPwMizM4UiN6yy9mMIGMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBACbQM9q9IjifGATTR+4IBLgGDnt22aiHOGHVg96OC2weZCxzJiw8Km5nFuTeF8KvVWjepl+8Ujd4vIDZaaBy2ChICxHc4Uz6my49H/k2ElWcVjB0sUVPN/Uqvo7jIGEuLVQoONwT03IU+AkB7VdLi4fdE=]
+influx2_token: ENC[PKCS7,MIIDDQYJKoZIhvcNAQcDoIIC/jCCAvoCAQAxggJkMIICYAIBADBIMDsxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxDDAKBgNVBAMMA2xvZwIJAKJzqf9oYCsrMA0GCSqGSIb3DQEBAQUABIICALuPgj+VUfERJUl9tYEmBpzJ43uuTqzBhrUnL719R1y7Gpv/3lIhURfI7Om8N1eDC1JMNu/LIPkGah9Fr4zs+MJtYcHPNFxHBhEqk0vmrhbWoi2JIleS+SCejr0S8MkfXKfdUOPq0hRtPzoWi9gtMB4Jxw9elzaFzrG1wDOftbxm/kUwNC68BbtUKdTAnIX8JB5pMbfk2A4wwT4vSP3aYlCgXwO1KUkRxaTNmNZD8P54QWBkKvMGSNyTfyMDv4qBMEP35YgBhPzdV4tRMZpguAoU6mj5vrcAyNEwUl67AY0Xgdbb/KcvtJsZry15eXOQkZs5edFuJQ4+BGK8A8gSqLVJwYNrZmz+nzJtX3ijPNaBmkHPMbbvlh40vbfGQnbOWcDffaxtYI1/5qglf/DPG/pOK0zP7kCpoL+gMdTFgMTfCiIh29vLQUs0RjT2az7cxnyR9RobgwwuvLDb2s9sf1VFGTB0e2NSf3UsqKnwyrf5a0tAd/imT2YgmYAi0Udn2/n6YUZ4e/FGas07O3eXT9xgXmlfBmepl8dAQQO4z+1nxm4zATEM34AABR5T5crZip/C6eVN8sGp2yTSUPMUryHe2/wzPViAJqcrC8KFV2JA5jacaB2DT9WRbwXvUix7LuZ+wx2cXbDhdpG5oIFguFLA9vuMy8F5rdb4gb88gGs2MIGMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDYRYnjQzbN0A4U8/SDrwjMgGCGAYz18Qe3Kdkp2tHMhlVBAkplB74x8gcl0omCToA3Lx2Ac+pl3gAoSzU3k6JoRbPfEDkkccHEsrycswzyxEEQ9IAa3B5qOcvZl1wyZhSVNcWGSDzU5OYDdiNzooic5IY=]
diff --git a/log.qa.sveidas.se/overlay/etc/telegraf/telegraf.conf.d/50-json-input.conf b/log.qa.sveidas.se/overlay/etc/telegraf/telegraf.conf.d/50-json-input.conf
index 85b55041..52b5dabc 100644
--- a/log.qa.sveidas.se/overlay/etc/telegraf/telegraf.conf.d/50-json-input.conf
+++ b/log.qa.sveidas.se/overlay/etc/telegraf/telegraf.conf.d/50-json-input.conf
@@ -9,26 +9,10 @@
 [[inputs.tail]]
   files = ["/var/log/eidas_proxy.log"]
   data_format = "json"
-  tag_keys = ["type",
-              "timestamp",
-              "connectorEntityId",
-              "requesterId",
-              "loaMatching",
-              "connectorCuntry",
-              "spType",
-              "requestedLoa",
-              "eidasResponseLoA",
-              "eidasRequestId",
-              "eidasResponseId",
-              "principal",
-              "nationalAssertionId",
-              "nationalRequestId",
-              "nationalIdP",
-              "eIDASAssertionIssueTime",
-              "eidasAssertionId"]
-  json_time_key = "timestamp"
-  json_time_format = "unix_ms"
-  json_timezone = "Local"
+  json_name_key = "type"
+  tag_keys = ["type", "requesterId", "connectorCuntry"]
+  [inputs.tail.tags]
+    influxdb_database = "proxy"
 [[processors.parser]]
   parse_fields = ["message"]
   merge = "override"