phares3757/gatus
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename json parameter condition-results to conditionResults

Browse Source
This commit is contained in:
TwinProduction 2021-01-25 20:55:49 -05:00
parent 67a3e4e330
commit 752c872d3b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/result.go
View File

@ -31,7 +31,7 @@ type Result struct {
Errors []string `json:"errors"` Errors []string `json:"errors"`
// ConditionResults results of the service's conditions // ConditionResults results of the service's conditions
ConditionResults []*ConditionResult `json:"condition-results"` ConditionResults []*ConditionResult `json:"conditionResults"`
// Success whether the result signifies a success or not // Success whether the result signifies a success or not
Success bool `json:"success"` Success bool `json:"success"`

4
static/index.html
View File

@ -194,8 +194,8 @@
$("#tooltip-response-time").text(parseInt(serviceResult.duration/1000000) + "ms"); $("#tooltip-response-time").text(parseInt(serviceResult.duration/1000000) + "ms");
// Populate the condition section // Populate the condition section
let conditions = ""; let conditions = "";
for (let i in serviceResult['condition-results']) { for (let i in serviceResult.conditionResults) {
let conditionResult = serviceResult['condition-results'][i]; let conditionResult = serviceResult.conditionResults[i];
conditions += (conditionResult.success ? "&#10003;" : "X") + " ~ " + htmlEntities(conditionResult.condition) + "<br />"; conditions += (conditionResult.success ? "&#10003;" : "X") + " ~ " + htmlEntities(conditionResult.condition) + "<br />";
} }
$("#tooltip-conditions").html(conditions); $("#tooltip-conditions").html(conditions);

2
storage/memory_test.go
View File

@ -194,7 +194,7 @@ func TestInMemoryStore_GetAllAsJSON(t *testing.T) {
if err != nil { if err != nil {
t.Fatal("shouldn't have returned an error, got", err.Error()) t.Fatal("shouldn't have returned an error, got", err.Error())
} }
expectedOutput := `{"group_name":{"name":"name","group":"group","results":[{"status":200,"hostname":"example.org","duration":150000000,"errors":null,"condition-results":[{"condition":"[STATUS] == 200","success":true},{"condition":"[RESPONSE_TIME] \u003c 500","success":true},{"condition":"[CERTIFICATE_EXPIRATION] \u003c 72h","success":true}],"success":true,"timestamp":"0001-01-01T00:00:00Z"},{"status":200,"hostname":"example.org","duration":750000000,"errors":["error-1","error-2"],"condition-results":[{"condition":"[STATUS] == 200","success":true},{"condition":"[RESPONSE_TIME] \u003c 500","success":false},{"condition":"[CERTIFICATE_EXPIRATION] \u003c 72h","success":false}],"success":false,"timestamp":"0001-01-01T00:00:00Z"}],"uptime":{"7d":0.5,"24h":0.5,"1h":0.5}}}` expectedOutput := `{"group_name":{"name":"name","group":"group","results":[{"status":200,"hostname":"example.org","duration":150000000,"errors":null,"conditionResults":[{"condition":"[STATUS] == 200","success":true},{"condition":"[RESPONSE_TIME] \u003c 500","success":true},{"condition":"[CERTIFICATE_EXPIRATION] \u003c 72h","success":true}],"success":true,"timestamp":"0001-01-01T00:00:00Z"},{"status":200,"hostname":"example.org","duration":750000000,"errors":["error-1","error-2"],"condition-results":[{"condition":"[STATUS] == 200","success":true},{"condition":"[RESPONSE_TIME] \u003c 500","success":false},{"condition":"[CERTIFICATE_EXPIRATION] \u003c 72h","success":false}],"success":false,"timestamp":"0001-01-01T00:00:00Z"}],"uptime":{"7d":0.5,"24h":0.5,"1h":0.5}}}`
if string(output) != expectedOutput { if string(output) != expectedOutput {
t.Errorf("expected:\n %s\n\ngot:\n %s", expectedOutput, string(output)) t.Errorf("expected:\n %s\n\ngot:\n %s", expectedOutput, string(output))
} }