diff --git a/main.go b/main.go index 4f4d321..3521f91 100644 --- a/main.go +++ b/main.go @@ -27,15 +27,15 @@ import ( "sync" "syscall" + "github.com/martin-helmich/prometheus-nginxlog-exporter/pkg/config" + "github.com/martin-helmich/prometheus-nginxlog-exporter/pkg/discovery" "github.com/martin-helmich/prometheus-nginxlog-exporter/pkg/metrics" - "github.com/martin-helmich/prometheus-nginxlog-exporter/syslog" - - "github.com/martin-helmich/prometheus-nginxlog-exporter/config" - "github.com/martin-helmich/prometheus-nginxlog-exporter/discovery" - "github.com/martin-helmich/prometheus-nginxlog-exporter/parser" - "github.com/martin-helmich/prometheus-nginxlog-exporter/prof" - "github.com/martin-helmich/prometheus-nginxlog-exporter/relabeling" - "github.com/martin-helmich/prometheus-nginxlog-exporter/tail" + "github.com/martin-helmich/prometheus-nginxlog-exporter/pkg/parser" + "github.com/martin-helmich/prometheus-nginxlog-exporter/pkg/prof" + "github.com/martin-helmich/prometheus-nginxlog-exporter/pkg/relabeling" + "github.com/martin-helmich/prometheus-nginxlog-exporter/pkg/syslog" + "github.com/martin-helmich/prometheus-nginxlog-exporter/pkg/tail" + "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" ) diff --git a/config/loader.go b/pkg/config/loader.go similarity index 100% rename from config/loader.go rename to pkg/config/loader.go diff --git a/config/loader_flags.go b/pkg/config/loader_flags.go similarity index 100% rename from config/loader_flags.go rename to pkg/config/loader_flags.go diff --git a/config/loader_flags_test.go b/pkg/config/loader_flags_test.go similarity index 100% rename from config/loader_flags_test.go rename to pkg/config/loader_flags_test.go diff --git a/config/loader_hcl.go b/pkg/config/loader_hcl.go similarity index 99% rename from config/loader_hcl.go rename to pkg/config/loader_hcl.go index d828771..b6a6ac5 100644 --- a/config/loader_hcl.go +++ b/pkg/config/loader_hcl.go @@ -1,9 +1,10 @@ package config import ( - "github.com/hashicorp/hcl" "io" "io/ioutil" + + "github.com/hashicorp/hcl" ) func loadConfigFromHCLStream(config *Config, file io.Reader) error { diff --git a/config/loader_test.go b/pkg/config/loader_test.go similarity index 100% rename from config/loader_test.go rename to pkg/config/loader_test.go diff --git a/config/loader_yaml.go b/pkg/config/loader_yaml.go similarity index 99% rename from config/loader_yaml.go rename to pkg/config/loader_yaml.go index 92177a6..b3c4309 100644 --- a/config/loader_yaml.go +++ b/pkg/config/loader_yaml.go @@ -1,9 +1,10 @@ package config import ( - "gopkg.in/yaml.v2" "io" "io/ioutil" + + "gopkg.in/yaml.v2" ) func loadConfigFromYAMLStream(config *Config, file io.Reader) error { diff --git a/config/struct_namespace.go b/pkg/config/struct_namespace.go similarity index 100% rename from config/struct_namespace.go rename to pkg/config/struct_namespace.go diff --git a/config/struct_namespace_test.go b/pkg/config/struct_namespace_test.go similarity index 100% rename from config/struct_namespace_test.go rename to pkg/config/struct_namespace_test.go diff --git a/config/struct_relabel.go b/pkg/config/struct_relabel.go similarity index 100% rename from config/struct_relabel.go rename to pkg/config/struct_relabel.go diff --git a/config/structs.go b/pkg/config/structs.go similarity index 100% rename from config/structs.go rename to pkg/config/structs.go diff --git a/config/test/file_3.txt b/pkg/config/test/file_3.txt similarity index 100% rename from config/test/file_3.txt rename to pkg/config/test/file_3.txt diff --git a/config/test/file_pattern_1.txt b/pkg/config/test/file_pattern_1.txt similarity index 100% rename from config/test/file_pattern_1.txt rename to pkg/config/test/file_pattern_1.txt diff --git a/config/test/file_pattern_2.txt b/pkg/config/test/file_pattern_2.txt similarity index 100% rename from config/test/file_pattern_2.txt rename to pkg/config/test/file_pattern_2.txt diff --git a/config/test/unrelated_file.txt b/pkg/config/test/unrelated_file.txt similarity index 100% rename from config/test/unrelated_file.txt rename to pkg/config/test/unrelated_file.txt diff --git a/discovery/consul.go b/pkg/discovery/consul.go similarity index 96% rename from discovery/consul.go rename to pkg/discovery/consul.go index 003c611..dca3f95 100644 --- a/discovery/consul.go +++ b/pkg/discovery/consul.go @@ -2,7 +2,7 @@ package discovery import ( "github.com/hashicorp/consul/api" - "github.com/martin-helmich/prometheus-nginxlog-exporter/config" + "github.com/martin-helmich/prometheus-nginxlog-exporter/pkg/config" ) // ConsulRegistrator is a helper struct that handles Consul service registration diff --git a/pkg/metrics/collection_init.go b/pkg/metrics/collection_init.go index 5a065a4..fa9abe1 100644 --- a/pkg/metrics/collection_init.go +++ b/pkg/metrics/collection_init.go @@ -1,8 +1,8 @@ package metrics import ( - "github.com/martin-helmich/prometheus-nginxlog-exporter/config" - "github.com/martin-helmich/prometheus-nginxlog-exporter/relabeling" + "github.com/martin-helmich/prometheus-nginxlog-exporter/pkg/config" + "github.com/martin-helmich/prometheus-nginxlog-exporter/pkg/relabeling" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/metrics/namespace.go b/pkg/metrics/namespace.go index d719f2f..f77a109 100644 --- a/pkg/metrics/namespace.go +++ b/pkg/metrics/namespace.go @@ -1,7 +1,7 @@ package metrics import ( - "github.com/martin-helmich/prometheus-nginxlog-exporter/config" + "github.com/martin-helmich/prometheus-nginxlog-exporter/pkg/config" "github.com/prometheus/client_golang/prometheus" ) diff --git a/parser/jsonparser/jsonparser.go b/pkg/parser/jsonparser/jsonparser.go similarity index 100% rename from parser/jsonparser/jsonparser.go rename to pkg/parser/jsonparser/jsonparser.go diff --git a/parser/jsonparser/jsonparser_test.go b/pkg/parser/jsonparser/jsonparser_test.go similarity index 100% rename from parser/jsonparser/jsonparser_test.go rename to pkg/parser/jsonparser/jsonparser_test.go diff --git a/parser/parser.go b/pkg/parser/parser.go similarity index 67% rename from parser/parser.go rename to pkg/parser/parser.go index 7242ca7..3a5f3ea 100644 --- a/parser/parser.go +++ b/pkg/parser/parser.go @@ -1,9 +1,9 @@ package parser import ( - "github.com/martin-helmich/prometheus-nginxlog-exporter/config" - "github.com/martin-helmich/prometheus-nginxlog-exporter/parser/jsonparser" - "github.com/martin-helmich/prometheus-nginxlog-exporter/parser/textparser" + "github.com/martin-helmich/prometheus-nginxlog-exporter/pkg/config" + "github.com/martin-helmich/prometheus-nginxlog-exporter/pkg/parser/jsonparser" + "github.com/martin-helmich/prometheus-nginxlog-exporter/pkg/parser/textparser" ) // Parser parses a line of log to a map[string]string. diff --git a/parser/textparser/textparser.go b/pkg/parser/textparser/textparser.go similarity index 100% rename from parser/textparser/textparser.go rename to pkg/parser/textparser/textparser.go diff --git a/parser/textparser/textparser_test.go b/pkg/parser/textparser/textparser_test.go similarity index 100% rename from parser/textparser/textparser_test.go rename to pkg/parser/textparser/textparser_test.go diff --git a/prof/cpu.go b/pkg/prof/cpu.go similarity index 100% rename from prof/cpu.go rename to pkg/prof/cpu.go diff --git a/prof/mem.go b/pkg/prof/mem.go similarity index 100% rename from prof/mem.go rename to pkg/prof/mem.go diff --git a/relabeling/defaults.go b/pkg/relabeling/defaults.go similarity index 89% rename from relabeling/defaults.go rename to pkg/relabeling/defaults.go index b6375e5..ad77426 100644 --- a/relabeling/defaults.go +++ b/pkg/relabeling/defaults.go @@ -1,6 +1,6 @@ package relabeling -import "github.com/martin-helmich/prometheus-nginxlog-exporter/config" +import "github.com/martin-helmich/prometheus-nginxlog-exporter/pkg/config" // DefaultRelabelings are hardcoded relabeling configs that are always there // and do not need to be explicitly configured diff --git a/relabeling/mapping.go b/pkg/relabeling/mapping.go similarity index 100% rename from relabeling/mapping.go rename to pkg/relabeling/mapping.go diff --git a/relabeling/mapping_test.go b/pkg/relabeling/mapping_test.go similarity index 94% rename from relabeling/mapping_test.go rename to pkg/relabeling/mapping_test.go index 7956463..63f5560 100644 --- a/relabeling/mapping_test.go +++ b/pkg/relabeling/mapping_test.go @@ -1,8 +1,9 @@ package relabeling import ( - "github.com/martin-helmich/prometheus-nginxlog-exporter/config" "testing" + + "github.com/martin-helmich/prometheus-nginxlog-exporter/pkg/config" ) func buildRelabeling(cfg config.RelabelConfig) (*Relabeling, error) { diff --git a/relabeling/types.go b/pkg/relabeling/types.go similarity index 95% rename from relabeling/types.go rename to pkg/relabeling/types.go index 52d1e71..762425c 100644 --- a/relabeling/types.go +++ b/pkg/relabeling/types.go @@ -1,6 +1,6 @@ package relabeling -import "github.com/martin-helmich/prometheus-nginxlog-exporter/config" +import "github.com/martin-helmich/prometheus-nginxlog-exporter/pkg/config" // Relabeling contains a relabeling configuration and is responsible for // executing the rules specified in the original configuration diff --git a/syslog/syslog.go b/pkg/syslog/syslog.go similarity index 100% rename from syslog/syslog.go rename to pkg/syslog/syslog.go diff --git a/tail/struct.go b/pkg/tail/struct.go similarity index 100% rename from tail/struct.go rename to pkg/tail/struct.go diff --git a/tail/syslog.go b/pkg/tail/syslog.go similarity index 100% rename from tail/syslog.go rename to pkg/tail/syslog.go diff --git a/tail/tailer.go b/pkg/tail/tailer.go similarity index 100% rename from tail/tailer.go rename to pkg/tail/tailer.go