Skip to content

Commit

Permalink
Added dashboard to GUI.
Browse files Browse the repository at this point in the history
More powerfull source() vql plugin can now automatically select range
of times from monitoring logs.

A heavy rework of the GUI.
  • Loading branch information
scudette committed May 27, 2019
1 parent 5d8e510 commit c7f0163
Show file tree
Hide file tree
Showing 85 changed files with 1,302 additions and 808 deletions.
2 changes: 1 addition & 1 deletion api/artifacts.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const (
description: |
This is the human readable description of the artifact.
# Can be CLIENT, EVENT, SERVER, SERVER_EVENT
# Can be CLIENT, CLIENT_EVENT, SERVER, SERVER_EVENT
type: CLIENT
parameters:
Expand Down
142 changes: 80 additions & 62 deletions api/proto/artifacts.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions api/proto/artifacts.proto
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ message GetReportRequest {
// Parameters for MONITORING_DAILY
string day_name = 6;

uint64 start_time = 8;
uint64 end_time = 9;

// Parameters for CLIENT
string flow_id = 7;

Expand Down
8 changes: 4 additions & 4 deletions api/reports.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@ func getReport(ctx context.Context,

case "SERVER_EVENT":
template_data, err = reporting.
GenerateServerMonitoringDailyReport(
template_engine, in.DayName)
GenerateServerMonitoringReport(
template_engine, in.StartTime, in.EndTime)
if err != nil {
return nil, err
}

// A MONITORING_DAILY report is a report generated
// over a single day of a monitoring artifact
case "MONITORING_DAILY":
case "MONITORING_DAILY", "CLIENT_EVENT":
template_data, err = reporting.GenerateMonitoringDailyReport(
template_engine, in.ClientId, in.DayName)
template_engine, in.ClientId, in.StartTime, in.EndTime)
if err != nil {
return nil, err
}
Expand Down
4 changes: 2 additions & 2 deletions artifacts/artifacts.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ func (self *Repository) LoadYaml(data string, validate bool) (
// By default use the client type.
artifact.Type = "client"

case "client", "event", "server", "server_event":
case "client", "client_event", "server", "server_event":
// These types are acceptable.

default:
Expand Down Expand Up @@ -307,7 +307,7 @@ func (self *Repository) mergeSources(artifact *artifacts_proto.Artifact,

// NOTE: The client does not receive the actual name
// or description because we compress the
// VQLCollectorArgs object before we sent it to them
// VQLCollectorArgs object before we send it to them
// (i.e. substitute the strings with place holders).
// It is therefore safe to include confidential
// information in the description or name properties
Expand Down
2 changes: 1 addition & 1 deletion artifacts/definitions/Demo/Plugins/Fifo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ description: |
Of course in the real artifact we would want to include more
information than just times (i.e. who logged on to where etc).
type: EVENT
type: CLIENT_EVENT

sources:
- queries:
Expand Down
2 changes: 1 addition & 1 deletion artifacts/definitions/Generic/Client/Stats.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ parameters:
- name: Frequency
description: Return stats every this many seconds.
default: "10"
type: EVENT
type: CLIENT_EVENT

sources:
- queries:
Expand Down
Loading

0 comments on commit c7f0163

Please sign in to comment.