Restructure remaining packages

martin-helmich · Apr 24, 2022 · 2c401ba · 2c401ba
1 parent 9e797f5
commit 2c401ba
Show file tree

Hide file tree

Showing 33 changed files with 23 additions and 20 deletions.
diff --git 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 → pkg/config/loader.go b/config/loader.go → pkg/config/loader.go
diff --git a/config/loader_flags.go → pkg/config/loader_flags.go b/config/loader_flags.go → pkg/config/loader_flags.go
diff --git a/config/loader_flags_test.go → pkg/config/loader_flags_test.go b/config/loader_flags_test.go → pkg/config/loader_flags_test.go
diff --git a/config/loader_hcl.go → pkg/config/loader_hcl.go b/config/loader_hcl.go → 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 → pkg/config/loader_test.go b/config/loader_test.go → pkg/config/loader_test.go
diff --git a/config/loader_yaml.go → pkg/config/loader_yaml.go b/config/loader_yaml.go → 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 → pkg/config/struct_namespace.go b/config/struct_namespace.go → pkg/config/struct_namespace.go
diff --git a/config/struct_namespace_test.go → pkg/config/struct_namespace_test.go b/config/struct_namespace_test.go → pkg/config/struct_namespace_test.go
diff --git a/config/struct_relabel.go → pkg/config/struct_relabel.go b/config/struct_relabel.go → pkg/config/struct_relabel.go
diff --git a/config/structs.go → pkg/config/structs.go b/config/structs.go → pkg/config/structs.go
diff --git a/config/test/file_3.txt → pkg/config/test/file_3.txt b/config/test/file_3.txt → pkg/config/test/file_3.txt
diff --git a/config/test/file_pattern_1.txt → pkg/config/test/file_pattern_1.txt b/config/test/file_pattern_1.txt → pkg/config/test/file_pattern_1.txt
diff --git a/config/test/file_pattern_2.txt → pkg/config/test/file_pattern_2.txt b/config/test/file_pattern_2.txt → pkg/config/test/file_pattern_2.txt
diff --git a/config/test/unrelated_file.txt → pkg/config/test/unrelated_file.txt b/config/test/unrelated_file.txt → pkg/config/test/unrelated_file.txt
diff --git a/discovery/consul.go → pkg/discovery/consul.go b/discovery/consul.go → 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
@@ -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
@@ -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 → pkg/parser/jsonparser/jsonparser.go b/parser/jsonparser/jsonparser.go → pkg/parser/jsonparser/jsonparser.go
diff --git a/parser/jsonparser/jsonparser_test.go → pkg/parser/jsonparser/jsonparser_test.go b/parser/jsonparser/jsonparser_test.go → pkg/parser/jsonparser/jsonparser_test.go
diff --git a/parser/parser.go → pkg/parser/parser.go b/parser/parser.go → 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 → pkg/parser/textparser/textparser.go b/parser/textparser/textparser.go → pkg/parser/textparser/textparser.go
diff --git a/parser/textparser/textparser_test.go → pkg/parser/textparser/textparser_test.go b/parser/textparser/textparser_test.go → pkg/parser/textparser/textparser_test.go
diff --git a/prof/cpu.go → pkg/prof/cpu.go b/prof/cpu.go → pkg/prof/cpu.go
diff --git a/prof/mem.go → pkg/prof/mem.go b/prof/mem.go → pkg/prof/mem.go
diff --git a/relabeling/defaults.go → pkg/relabeling/defaults.go b/relabeling/defaults.go → 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 → pkg/relabeling/mapping.go b/relabeling/mapping.go → pkg/relabeling/mapping.go
diff --git a/relabeling/mapping_test.go → pkg/relabeling/mapping_test.go b/relabeling/mapping_test.go → 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 → pkg/relabeling/types.go b/relabeling/types.go → 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 → pkg/syslog/syslog.go b/syslog/syslog.go → pkg/syslog/syslog.go
diff --git a/tail/struct.go → pkg/tail/struct.go b/tail/struct.go → pkg/tail/struct.go
diff --git a/tail/syslog.go → pkg/tail/syslog.go b/tail/syslog.go → pkg/tail/syslog.go
diff --git a/tail/tailer.go → pkg/tail/tailer.go b/tail/tailer.go → pkg/tail/tailer.go