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

Fix export_dashboards command #8954

Merged
merged 1 commit into from
Nov 7, 2018
Merged

Conversation

tsg
Copy link
Contributor

@tsg tsg commented Nov 6, 2018

panelJSON is/can be an array, so marshaling to MapStr caused
problems. I think this was the root cause for #8952.

`panelJSON` is/can be an array, so marshaling to MapStr caused
problems. I think this was the root cause for elastic#8952.
@tsg tsg added needs_backport PR is waiting to be backported to other branches. review labels Nov 6, 2018
@tsg tsg requested review from ruflin and andrewkroh November 6, 2018 23:38
@@ -117,7 +117,7 @@ func decodeValue(data common.MapStr, key string) {
return
}
s := v.(string)
var d common.MapStr
var d interface{}
json.Unmarshal([]byte(s), &d)
Copy link
Member

Choose a reason for hiding this comment

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

This code is lax on error handling. Checking the Unmarshal result and returning an error or panicking would be helpful.

@ruflin
Copy link
Contributor

ruflin commented Nov 7, 2018

@joshuar @ycombinator Haven't tested it but it might also fix #8200

Copy link
Contributor

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

LGTM

I can follow up on the error handling in #7730

@ruflin
Copy link
Contributor

ruflin commented Nov 7, 2018

@andrewkroh @tsg Here is the commit for #7730 for the error handling 9ff0847

@tsg tsg merged commit 5546e8b into elastic:master Nov 7, 2018
@ycombinator ycombinator added v6.6.0 and removed needs_backport PR is waiting to be backported to other branches. labels Nov 15, 2018
ycombinator added a commit that referenced this pull request Nov 19, 2018
`panelJSON` is/can be an array, so marshaling to MapStr caused
problems. I think this was the root cause for #8952.

(cherry picked from commit 5546e8b)
bobapple added a commit to Icinga/icingabeat that referenced this pull request Dec 20, 2018
andrewkroh added a commit to andrewkroh/beats that referenced this pull request Jan 4, 2019
This dashboard was probably exported prior to the fix for elastic#8954.

Fixes elastic#9850
andrewkroh added a commit that referenced this pull request Jan 5, 2019
This dashboard was probably exported prior to the fix for #8954.

Fixes #9850
andrewkroh added a commit to andrewkroh/beats that referenced this pull request Jan 6, 2019
This dashboard was probably exported prior to the fix for elastic#8954.

Fixes elastic#9850

(cherry picked from commit eddf69e)
andrewkroh added a commit to andrewkroh/beats that referenced this pull request Jan 6, 2019
This dashboard was probably exported prior to the fix for elastic#8954.

Fixes elastic#9850

(cherry picked from commit eddf69e)
andrewkroh added a commit that referenced this pull request Jan 8, 2019
This dashboard was probably exported prior to the fix for #8954.

Fixes #9850

(cherry picked from commit eddf69e)
andrewkroh added a commit that referenced this pull request Jan 10, 2019
This dashboard was probably exported prior to the fix for #8954.

Fixes #9850

(cherry picked from commit eddf69e)
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
This dashboard was probably exported prior to the fix for elastic#8954.

Fixes elastic#9850

(cherry picked from commit cbbb7dd)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants