Skip to content

Fix for on-demand queries logging in splunk/graylog #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 3, 2019
Merged

Fix for on-demand queries logging in splunk/graylog #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cmd/admin/json-queries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ func jsonQueryHandler(w http.ResponseWriter, r *http.Request) {
status = queries.StatusComplete
}
progress := make(QueryProgress)
progress["expected"] = q.Expected
progress["executions"] = q.Executions
progress["errors"] = q.Errors
data := make(QueryData)
Expand Down
2 changes: 1 addition & 1 deletion cmd/admin/settings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func loadingSettings() {
if err != nil {
log.Fatalf("Failed to initialize metrics (port): %v", err)
}
_metrics, err = metrics.CreateMetrics(mProtocol, mHost, int(mPort), settings.ServiceAdmin)
_metrics, err = metrics.CreateMetrics(mProtocol, mHost, int(mPort), serviceName)
if err != nil {
log.Fatalf("Failed to initialize metrics: %v", err)
}
Expand Down
5 changes: 3 additions & 2 deletions cmd/admin/templates/queries.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,9 @@
data: 'progress',
render: function (data, type, row, meta) {
if (type === 'display') {
return '<span style="color:green;">'+data.executions+'</span>/' +
'<span style="color:red;">'+data.errors+'</span>';
return '<span style="color:black;">'+data.expected+'</span>/' +
'<b><span style="color:green;">'+data.executions+'</span></b>/' +
'<b><span style="color:red;">'+data.errors+'</span></b>';
} else {
return data;
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/tls/settings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func loadingSettings() {
if err != nil {
log.Fatalf("Failed to initialize metrics (port): %v", err)
}
_metrics, err = metrics.CreateMetrics(mProtocol, mHost, int(mPort), settings.ServiceTLS)
_metrics, err = metrics.CreateMetrics(mProtocol, mHost, int(mPort), serviceName)
if err != nil {
log.Fatalf("Failed to initialize metrics: %v", err)
}
Expand Down
5 changes: 3 additions & 2 deletions pkg/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ import (
"log"
"net/http"
"net/http/httputil"
"strings"
)

// SendRequest - Helper function to send HTTP requests
func SendRequest(secure bool, reqType, url string, params io.Reader, headers map[string]string) (int, []byte, error) {
func SendRequest(reqType, url string, params io.Reader, headers map[string]string) (int, []byte, error) {
var client *http.Client
if secure {
if strings.HasPrefix(url, "https") {
tr := &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/graylog_logging/plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func GraylogSend(logType string, data []byte, environment, uuid, url string, deb
log.Printf("Sending %d bytes to Graylog for %s - %s", len(data), environment, uuid)
}
// Send log with a POST to the Graylog URL
resp, body, err := utils.SendRequest(true, graylogMethod, url, jsonParam, headers)
resp, body, err := utils.SendRequest(graylogMethod, url, jsonParam, headers)
if err != nil {
log.Printf("Error sending request %s", err)
return
Expand Down
10 changes: 0 additions & 10 deletions plugins/logging_dispatcher/control.go
View file
Open in desktop

This file was deleted.

69 changes: 37 additions & 32 deletions plugins/logging_dispatcher/logging.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,42 +20,37 @@ var (
// Initialization of the plugin
func init() {
var err error
if graylogEnabled {
graylogCfg, err = loadGraylogConfiguration()
if err != nil {
// Check if Graylog is ready to load
graylogCfg, err = loadGraylogConfiguration()
if err != nil {
graylogReady = false
} else {
if err := loadGraylogPlugin(); err != nil {
graylogReady = false
log.Printf("Failed to load graylog json - %v", err)
log.Printf("Failed to load graylog plugin - %v", err)
} else {
if err := loadGraylogPlugin(); err != nil {
graylogReady = false
log.Printf("Failed to load graylog plugin - %v", err)
} else {
graylogReady = true
}
graylogReady = true
}
}
if splunkEnabled {
splunkCfg, err = loadSplunkConfiguration()
if err != nil {
// Check if Splunk is ready to load
splunkCfg, err = loadSplunkConfiguration()
if err != nil {
splunkReady = false
} else {
if err := loadSplunkPlugin(); err != nil {
splunkReady = false
log.Printf("Failed to load splunk json - %v", err)
log.Printf("Failed to load splunk plugin - %v", err)
} else {
if err := loadSplunkPlugin(); err != nil {
splunkReady = false
log.Printf("Failed to load splunk plugin - %v", err)
} else {
splunkReady = true
}
splunkReady = true
}
}
if dbEnabled {
err = loadDBPlugin()
if err != nil {
dbReady = false
log.Printf("Failed to load db plugin - %v", err)
} else {
dbReady = true
}
// Loading DB plugin regardless
err = loadDBPlugin()
if err != nil {
dbReady = false
log.Printf("Failed to load db plugin - %v", err)
} else {
dbReady = true
}
}

Expand All @@ -67,18 +62,28 @@ func LogsDispatcher(logging, logType string, params ...interface{}) {
uuid := params[3].(string)
switch logging {
case settings.LoggingGraylog:
debug := params[4].(bool)
if graylogReady {
var debug bool
if logType == types.QueryLog {
debug = params[6].(bool)
} else {
debug = params[4].(bool)
}
graylogSend(logType, data, environment, uuid, graylogCfg.URL, debug)
} else {
log.Printf("Logging with %s isn't ready - Dropping %d bytes", graylogName, len(data))
log.Printf("Logging with %s isn't ready [%s] - Dropping %d bytes", graylogName, graylogCfg.URL, len(data))
}
case settings.LoggingSplunk:
debug := params[4].(bool)
if splunkReady {
var debug bool
if logType == types.QueryLog {
debug = params[6].(bool)
} else {
debug = params[4].(bool)
}
splunkSend(logType, data, environment, uuid, splunkCfg.URL, splunkCfg.Token, debug)
} else {
log.Printf("Logging with %s isn't ready - Dropping %d bytes", splunkName, len(data))
log.Printf("Logging with %s isn't ready [%s] - Dropping %d bytes", splunkName, splunkCfg.URL, len(data))
}
case settings.LoggingDB:
if dbReady {
Expand Down
2 changes: 1 addition & 1 deletion plugins/splunk_logging/plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func SplunkSend(logType string, data []byte, environment, uuid, url, token strin
log.Printf("Sending %d bytes to Splunk for %s - %s", len(data), environment, uuid)
}
// Send log with a POST to the Splunk URL
resp, body, err := utils.SendRequest(true, splunkMethod, url, jsonParam, headers)
resp, body, err := utils.SendRequest(splunkMethod, url, jsonParam, headers)
if err != nil {
log.Printf("Error sending request %s", err)
}
Expand Down