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.

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

Added alert contacts data to getMonitor and getAllMonitors methods. #26

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Added alert contacts data to getMonitor and getAllMonitors methods. #26

wants to merge 4 commits into from

Conversation

ghost
Copy link

@ghost ghost commented Dec 27, 2020

#25

@ghost ghost mentioned this pull request Dec 27, 2020
@ghost
Copy link
Author

ghost commented Dec 27, 2020

Also added #23

Copy link
Owner

@bitfield bitfield left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good!

pkg/client.go Outdated Show resolved Hide resolved
pkg/constants.go Show resolved Hide resolved
@@ -169,6 +170,19 @@ func (m *Monitor) UnmarshalJSON(data []byte) error {
raw[f] = v
}
}
// We don't need full AlertContact structure, we need only its ID
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, if we're going to do this, we might as well define the proper struct!

Copy link
Author

@ghost ghost Dec 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Proper struct defined for the Monitor (pkg/monitor.go). This was not changed. There we have

type Monitor struct {
        ...
	AlertContacts []string `json:"alert_contacts,omitempty"`
        ...
}

And in the pkg/alert_contact.go we have

type AlertContact struct {
	ID           string `json:"id"`
        ...
}

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I misunderstood your comment, then. I thought you were saying you weren't going to unmarshal the complete struct. Are you?

Copy link
Author

@ghost ghost Dec 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. We have a structure for AlertContact, and we have field AlertContacts (type []string) in Monitor structure. We don't need complete AlertContact struct in Monotor, that's why I used only AlertContact.Id.

May be I misunderstood your first question. What did you mean by

Well, if we're going to do this, we might as well define the proper struct!

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bitfield Are you still remember about this?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't forgotten about this, but it needs a non-trivial amount of time to get my head back into this project and review your code properly. I'll try to get to it as soon as I can!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants