Skip to content

Commit abed73e

Browse files
author
Chan Gao
committed
1. Fix a problem of failed to backup monitors, #13 2. Add some debug logging
1 parent fd3e8bd commit abed73e

3 files changed

Lines changed: 41 additions & 23 deletions

File tree

‎cmd/backup/backup_alertsconditions.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ var alertsconditionsCmd = &cobra.Command{
142142
// alertPolicySet.MonitorList := []*newrelic.Monitor
143143
for _, monitor := range syntheticsArray {
144144
if monitor.MonitorID != nil {
145+
fmt.Printf("Calling GetMonitorByID() func, monitor id: %s\n", *monitor.MonitorID)
145146
m, err, ret := get.GetMonitorByID(*monitor.MonitorID)
146147
if err != nil {
147148
fmt.Println(err)

‎cmd/get/get_monitor.go‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ var monitorCmd = &cobra.Command{
7171
}
7272

7373
func GetMonitorByID(id string) (*newrelic.Monitor, error, tracker.ReturnValue) {
74+
fmt.Printf("Enter GetMonitorByID() func, monitor id: %s\n", id)
7475
client, err := utils.GetNewRelicClient("synthetics")
7576
if err != nil {
7677
fmt.Println(err)
@@ -137,23 +138,31 @@ func GetMonitorByID(id string) (*newrelic.Monitor, error, tracker.ReturnValue) {
137138
monitorID := monitor.ID
138139
var id string = ""
139140
id = *monitorID
140-
scriptText, _, err := client.SyntheticsScript.GetByID(context.Background(), id)
141+
scriptText, resp, err := client.SyntheticsScript.GetByID(context.Background(), id)
141142

142143
tracker.AppendRESTCallResult(client.SyntheticsScript, tracker.OPERATION_NAME_GET_MONITOR_SCRIPT, resp.StatusCode, "monitor id: "+id+", monitor name: "+(*monitor.Name))
143144

144-
if err != nil {
145-
fmt.Println(err)
146-
// var st *newrelic.Script
147-
// st = &newrelic.Script{}
148-
// scriptText = st
149-
ret := tracker.ToReturnValue(false, tracker.OPERATION_NAME_GET_MONITOR_BY_ID, err, tracker.ERR_REST_CALL, "")
150-
return nil, err, ret
151-
}
152-
if resp.StatusCode >= 400 {
145+
if resp.StatusCode == 404 {
153146
var statusCode = resp.StatusCode
154147
fmt.Printf("Response status code: %d. Get one monitor script, monitor id '%s', monitor name '%s'\n", statusCode, id, *monitor.Name)
155-
ret := tracker.ToReturnValue(false, tracker.OPERATION_NAME_GET_MONITOR_BY_ID, tracker.ERR_REST_CALL_NOT_2XX, tracker.ERR_REST_CALL_NOT_2XX, "monitor id: "+id+", monitor name: "+(*monitor.Name))
156-
return nil, err, ret
148+
s := new(newrelic.Script)
149+
s.ScriptText = new(string)
150+
scriptText = s
151+
} else {
152+
if err != nil {
153+
fmt.Println(err)
154+
// var st *newrelic.Script
155+
// st = &newrelic.Script{}
156+
// scriptText = st
157+
ret := tracker.ToReturnValue(false, tracker.OPERATION_NAME_GET_MONITOR_BY_ID, err, tracker.ERR_REST_CALL, "")
158+
return nil, err, ret
159+
}
160+
if resp.StatusCode >= 400 {
161+
var statusCode = resp.StatusCode
162+
fmt.Printf("Response status code: %d. Get one monitor script, monitor id '%s', monitor name '%s'\n", statusCode, id, *monitor.Name)
163+
ret := tracker.ToReturnValue(false, tracker.OPERATION_NAME_GET_MONITOR_BY_ID, tracker.ERR_REST_CALL_NOT_2XX, tracker.ERR_REST_CALL_NOT_2XX, "monitor id: "+id+", monitor name: "+(*monitor.Name))
164+
return nil, err, ret
165+
}
157166
}
158167
monitor.Script = scriptText
159168
}

‎cmd/get/get_monitors.go‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -178,19 +178,27 @@ func GetMonitors() ([]*newrelic.Monitor, error, tracker.ReturnValue) {
178178

179179
tracker.AppendRESTCallResult(client.SyntheticsScript, tracker.OPERATION_NAME_GET_MONITOR_SCRIPT, resp.StatusCode, "monitor id: "+id+", monitor name: "+(*monitor.Name))
180180

181-
if err != nil {
182-
fmt.Println(err)
183-
// var st *newrelic.Script
184-
// st = &newrelic.Script{}
185-
// scriptText = st
186-
ret := tracker.ToReturnValue(false, tracker.OPERATION_NAME_GET_MONITOR_SCRIPT, err, tracker.ERR_REST_CALL, "")
187-
return nil, err, ret
188-
}
189-
if resp.StatusCode >= 400 {
181+
if resp.StatusCode == 404 {
190182
var statusCode = resp.StatusCode
191183
fmt.Printf("Response status code: %d. Get one monitor script, monitor id '%s', monitor name '%s'\n", statusCode, id, *monitor.Name)
192-
ret := tracker.ToReturnValue(false, tracker.OPERATION_NAME_GET_MONITOR_SCRIPT, tracker.ERR_REST_CALL_NOT_2XX, tracker.ERR_REST_CALL_NOT_2XX, "monitor id: "+id+", monitor name: "+(*monitor.Name))
193-
return nil, err, ret
184+
s := new(newrelic.Script)
185+
s.ScriptText = new(string)
186+
scriptText = s
187+
} else {
188+
if err != nil {
189+
fmt.Println(err)
190+
// var st *newrelic.Script
191+
// st = &newrelic.Script{}
192+
// scriptText = st
193+
ret := tracker.ToReturnValue(false, tracker.OPERATION_NAME_GET_MONITOR_SCRIPT, err, tracker.ERR_REST_CALL, "")
194+
return nil, err, ret
195+
}
196+
if resp.StatusCode >= 400 {
197+
var statusCode = resp.StatusCode
198+
fmt.Printf("Response status code: %d. Get one monitor script, monitor id '%s', monitor name '%s'\n", statusCode, id, *monitor.Name)
199+
ret := tracker.ToReturnValue(false, tracker.OPERATION_NAME_GET_MONITOR_SCRIPT, tracker.ERR_REST_CALL_NOT_2XX, tracker.ERR_REST_CALL_NOT_2XX, "monitor id: "+id+", monitor name: "+(*monitor.Name))
200+
return nil, err, ret
201+
}
194202
}
195203
monitor.Script = scriptText
196204
monitorArray[i] = monitor

0 commit comments

Comments
 (0)