Skip to content
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

Display last 100 entries for status and result logs #455

Merged
merged 3 commits into from
Jul 10, 2024
Merged

Display last 100 entries for status and result logs #455

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50979c9
Display last status and result logs
javuto Jul 10, 2024
e4349d0
Fix for Incorrect conversion between integer types
javuto Jul 10, 2024
fa01a01
Fix for Incorrect conversion between integer types
javuto Jul 10, 2024
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
28 changes: 19 additions & 9 deletions admin/handlers/json-logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,18 +108,28 @@
}
// Extract parameter for seconds
// If parameter is not present or invalid, it defaults to 6 hours back
secondsBack := int64(utils.SixHours)
seconds, ok := r.URL.Query()["seconds"]
// secondsBack := int64(utils.SixHours)
// seconds, ok := r.URL.Query()["seconds"]
// if ok {
// s, err := strconv.ParseInt(seconds[0], 10, 64)
// if err == nil {
// secondsBack = s
// }
// }
// Extract parameter for limit
// If parameter is not present or invalid, it defaults to 100 items
limitItems := 100
limit, ok := r.URL.Query()["limit"]
if ok {
s, err := strconv.ParseInt(seconds[0], 10, 64)
l, err := strconv.ParseInt(limit[0], 10, 64)
if err == nil {
secondsBack = s
limitItems = int(l)
Fixed Show fixed Hide fixed
}
}
// Get logs
logJSON := []LogJSON{}
if logType == types.StatusLog && h.AdminConfig.Logger == settings.LoggingDB {
statusLogs, err := h.DBLogger.StatusLogs(UUID, env.Name, secondsBack)
statusLogs, err := h.DBLogger.StatusLogsLimit(UUID, env.Name, limitItems)
if err != nil {
log.Printf("error getting logs %v", err)
h.Inc(metricJSONErr)
Expand All @@ -138,8 +148,8 @@
}
logJSON = append(logJSON, _l)
}
} else if logType == types.ResultLog && h.RedisCache != nil {
resultLogs, err := h.RedisCache.ResultLogs(UUID, env.Name, secondsBack)
} else if logType == types.ResultLog && h.AdminConfig.Logger == settings.LoggingDB {
resultLogs, err := h.DBLogger.ResultLogsLimit(UUID, env.Name, limitItems)
if err != nil {
log.Printf("error getting logs %v", err)
h.Inc(metricJSONErr)
Expand All @@ -149,8 +159,8 @@
for _, r := range resultLogs {
_l := LogJSON{
Created: CreationTimes{
Display: utils.PastFutureTimesEpoch(int64(r.UnixTime)),
Timestamp: strconv.Itoa(int(r.UnixTime)),
Display: utils.PastFutureTimes(r.CreatedAt),
Timestamp: strconv.Itoa(int(r.CreatedAt.Unix())),
},
First: r.Name,
Second: string(r.Columns),
Expand Down
6 changes: 4 additions & 2 deletions admin/templates/node.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,8 @@
<div class="card mt-2">
<div id="status-card-header" class="card-header">
<i class="fas fa-stream"></i>
<label for="back_hours_status">Last <b><output id="back_output_status">6</output></b> hours of status logs for node {{ .UUID }}</label>
<!-- <label for="back_hours_status">Last <b><output id="back_output_status">6</output></b> hours of status logs for node {{ .UUID }}</label> -->
<label for="back_hours_status">Last <b><output>100</output id="back_output_status"></b> entries of status logs for node {{ .UUID }}</label>
<a href="#status-logs" target="_blank">
<i class="fas fa-external-link-alt"></i>
</a>
Expand Down Expand Up @@ -416,7 +417,8 @@
<div class="card mt-2">
<div id="result-card-header" class="card-header">
<i class="fas fa-stream"></i>
<label for="back_hours_result">Last <b><output id="back_output_result">6</output></b> hours of status logs for node {{ .UUID }}</label>
<!-- <label for="back_hours_result">Last <b><output id="back_output_result">6</output></b> hours of result logs for node {{ .UUID }}</label> -->
<label for="back_hours_result">Last <b><output id="back_output_result">100</output></b> entries of result logs for node {{ .UUID }}</label>
<a href="#result-logs" target="_blank">
<i class="fas fa-external-link-alt"></i>
</a>
Expand Down
22 changes: 20 additions & 2 deletions logging/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,16 @@ func (logDB *LoggerDB) QueryLogs(name string) ([]OsqueryQueryData, error) {
func (logDB *LoggerDB) StatusLogs(uuid, environment string, seconds int64) ([]OsqueryStatusData, error) {
var logs []OsqueryStatusData
minusSeconds := time.Now().Add(time.Duration(-seconds) * time.Second)
if err := logDB.Database.Conn.Where("uuid = ? AND environment = ?", strings.ToUpper(uuid), environment).Where("created_at > ?", minusSeconds).Find(&logs).Error; err != nil {
if err := logDB.Database.Conn.Where("uuid = ? AND environment = ?", strings.ToUpper(uuid), environment).Where("created_at < ?", minusSeconds).Find(&logs).Error; err != nil {
return logs, err
}
return logs, nil
}

// StatusLogsLimit will retrieve a limited number of status logs
func (logDB *LoggerDB) StatusLogsLimit(uuid, environment string, limit int) ([]OsqueryStatusData, error) {
var logs []OsqueryStatusData
if err := logDB.Database.Conn.Where("uuid = ? AND environment = ?", strings.ToUpper(uuid), environment).Order("created_at desc").Limit(limit).Find(&logs).Error; err != nil {
return logs, err
}
return logs, nil
Expand All @@ -207,7 +216,16 @@ func (logDB *LoggerDB) StatusLogs(uuid, environment string, seconds int64) ([]Os
func (logDB *LoggerDB) ResultLogs(uuid, environment string, seconds int64) ([]OsqueryResultData, error) {
var logs []OsqueryResultData
minusSeconds := time.Now().Add(time.Duration(-seconds) * time.Second)
if err := logDB.Database.Conn.Where("uuid = ? AND environment = ?", strings.ToUpper(uuid), environment).Where("created_at > ?", minusSeconds).Find(&logs).Error; err != nil {
if err := logDB.Database.Conn.Where("uuid = ? AND environment = ?", strings.ToUpper(uuid), environment).Where("created_at < ?", minusSeconds).Find(&logs).Error; err != nil {
return logs, err
}
return logs, nil
}

// ResultLogsLimit will retrieve a limited number of result logs
func (logDB *LoggerDB) ResultLogsLimit(uuid, environment string, limit int) ([]OsqueryResultData, error) {
var logs []OsqueryResultData
if err := logDB.Database.Conn.Where("uuid = ? AND environment = ?", strings.ToUpper(uuid), environment).Order("created_at").Limit(limit).Find(&logs).Error; err != nil {
return logs, err
}
return logs, nil
Expand Down