From 67b3a2808db2d47ed47d5f56c521eacf19099efd Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Sun, 28 Feb 2021 03:32:06 -0500 Subject: start on some changes for influxdb 2.0 remove chronograf, move to token auth instead of http basic auth need to remove kapacitor too, but have to port the alerts first --- modules/tick/files/chronograf | 2 -- modules/tick/manifests/server.pp | 1 - modules/tick/manifests/server/chronograf.pp | 23 ----------------------- modules/tick/templates/telegraf.conf | 7 ++++--- 4 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 modules/tick/files/chronograf delete mode 100644 modules/tick/manifests/server/chronograf.pp (limited to 'modules/tick') diff --git a/modules/tick/files/chronograf b/modules/tick/files/chronograf deleted file mode 100644 index 1baf186..0000000 --- a/modules/tick/files/chronograf +++ /dev/null @@ -1,2 +0,0 @@ -HOST=127.0.0.1 -BOLT_PATH=/media/persistent/chronograf/chronograf-v1.db diff --git a/modules/tick/manifests/server.pp b/modules/tick/manifests/server.pp index 81c54c9..e9a52ba 100644 --- a/modules/tick/manifests/server.pp +++ b/modules/tick/manifests/server.pp @@ -1,5 +1,4 @@ class tick::server { contain tick::server::influxdb - contain tick::server::chronograf contain tick::server::kapacitor } diff --git a/modules/tick/manifests/server/chronograf.pp b/modules/tick/manifests/server/chronograf.pp deleted file mode 100644 index 068539e..0000000 --- a/modules/tick/manifests/server/chronograf.pp +++ /dev/null @@ -1,23 +0,0 @@ -class tick::server::chronograf { - package::makepkg { 'chronograf-bin': - ensure => installed; - } - - file { - "/etc/default/chronograf": - source => "puppet:///modules/tick/chronograf", - require => Package::Makepkg['chronograf-bin'], - notify => Service['chronograf']; - "/media/persistent/chronograf": - ensure => directory, - owner => "chronograf", - group => "chronograf", - require => Package::Makepkg['chronograf-bin']; - } - - service { 'chronograf': - ensure => running, - enable => true, - require => Package::Makepkg['chronograf-bin']; - } -} diff --git a/modules/tick/templates/telegraf.conf b/modules/tick/templates/telegraf.conf index ba307bd..4fffce8 100644 --- a/modules/tick/templates/telegraf.conf +++ b/modules/tick/templates/telegraf.conf @@ -10,7 +10,8 @@ precision = "" hostname = "" omit_hostname = false -[[outputs.influxdb]] +[[outputs.influxdb_v2]] urls = ["https://influxdb.tozt.net"] - username = "<%= @influxdb_username %>" - password = "<%= @influxdb_password %>" + token = "<%= @influxdb_token %>" + organization = "tozt" + bucket = "telegraf" -- cgit v1.2.3-54-g00ecf