From 087c581393cc48d5e51ea3ce8e300e91c55ba603 Mon Sep 17 00:00:00 2001
From: Ulric Qin <ulric.qin@gmail.com>
Date: Sun, 17 Apr 2022 11:05:12 +0800
Subject: [PATCH] code refactor

---
 README.md                                          | 14 ++++++++++++++
 inputs/linux_sysctl_fs/linux_sysctl_fs_linux.go    |  3 ++-
 inputs/processes/processes_notwindows.go           |  4 ++--
 .../linux_sysctl_fs.go => pkg/osx/proc.go          |  2 +-
 4 files changed, 19 insertions(+), 4 deletions(-)
 rename inputs/linux_sysctl_fs/linux_sysctl_fs.go => pkg/osx/proc.go (86%)

diff --git a/README.md b/README.md
index 6549805..376d535 100644
--- a/README.md
+++ b/README.md
@@ -15,3 +15,17 @@ go build
 ```shell
 tar zcvf categraf.tar.gz categraf conf
 ```
+
+## todo
+
+[]ntp
+[]exec
+[]ping
+[]net_response
+[]http_response
+[]scrape
+[]procstat
+[]oracle
+[]mysql
+[]redis
+[]...
\ No newline at end of file
diff --git a/inputs/linux_sysctl_fs/linux_sysctl_fs_linux.go b/inputs/linux_sysctl_fs/linux_sysctl_fs_linux.go
index c9274a6..57b7fe6 100644
--- a/inputs/linux_sysctl_fs/linux_sysctl_fs_linux.go
+++ b/inputs/linux_sysctl_fs/linux_sysctl_fs_linux.go
@@ -12,6 +12,7 @@ import (
 	"strconv"
 
 	"flashcat.cloud/categraf/inputs"
+	"flashcat.cloud/categraf/pkg/osx"
 	"flashcat.cloud/categraf/types"
 )
 
@@ -27,7 +28,7 @@ type SysctlFS struct {
 func init() {
 	inputs.Add(inputName, func() inputs.Input {
 		return &SysctlFS{
-			path: path.Join(GetHostProc(), "/sys/fs"),
+			path: path.Join(osx.GetHostProc(), "/sys/fs"),
 		}
 	})
 }
diff --git a/inputs/processes/processes_notwindows.go b/inputs/processes/processes_notwindows.go
index 2cd8ba0..c222f42 100644
--- a/inputs/processes/processes_notwindows.go
+++ b/inputs/processes/processes_notwindows.go
@@ -15,7 +15,7 @@ import (
 	"syscall"
 
 	"flashcat.cloud/categraf/inputs"
-	"flashcat.cloud/categraf/inputs/linux_sysctl_fs"
+	"flashcat.cloud/categraf/pkg/osx"
 	"flashcat.cloud/categraf/types"
 )
 
@@ -145,7 +145,7 @@ func (p *Processes) gatherFromPS(fields map[string]interface{}) error {
 
 // get process states from /proc/(pid)/stat files
 func (p *Processes) gatherFromProc(fields map[string]interface{}) error {
-	filenames, err := filepath.Glob(linux_sysctl_fs.GetHostProc() + "/[0-9]*/stat")
+	filenames, err := filepath.Glob(osx.GetHostProc() + "/[0-9]*/stat")
 	if err != nil {
 		return err
 	}
diff --git a/inputs/linux_sysctl_fs/linux_sysctl_fs.go b/pkg/osx/proc.go
similarity index 86%
rename from inputs/linux_sysctl_fs/linux_sysctl_fs.go
rename to pkg/osx/proc.go
index 0a57bc9..78225b9 100644
--- a/inputs/linux_sysctl_fs/linux_sysctl_fs.go
+++ b/pkg/osx/proc.go
@@ -1,4 +1,4 @@
-package linux_sysctl_fs
+package osx
 
 import "os"