-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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 license ID field name #14592
Fix license ID field name #14592
Conversation
Pinging @elastic/stack-monitoring (Stack monitoring) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
changelog maybe?
Thanks @kaiyan-sheng. I added a CHANGELOG entry in fe2585cb27d1c92bda0004e1b9df1f87b8b1c80b. |
fe2585c
to
0c6ceb3
Compare
jenkins, test this |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tested this and verified that uid
does appear in the output:
{
"hits": {
"hits": [
{
"_source": {
"license": {
"cluster_needs_tls": false,
"issue_date": "2019-11-19T13:22:30.234Z",
"issue_date_in_millis": 1574169750234,
"issued_to": "elasticsearch",
"issuer": "elasticsearch",
"max_nodes": 1000,
"start_date_in_millis": -1,
"status": "active",
"type": "basic",
"uid": "5d88b23d-96ad-4bc4-8f0d-9983354e42c8"
}
}
}
]
}
}
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
POST .monitoring-es-7-mb-2019.11.19/_search?filter_path=hits.hits._source.license
{
"size": 1,
"sort": [
{
"timestamp": {
"order": "desc"
}
}
],
"query": {
"term": {
"type": {
"value": "cluster_stats"
}
}
}
}
yields:
{
"hits" : {
"hits" : [
{
"_source" : {
"license" : {
"status" : "active",
"expiry_date" : "2019-12-19T01:55:30.299Z",
"type" : "trial",
"issue_date_in_millis" : 1574128530299,
"max_nodes" : 1000,
"issuer" : "elasticsearch",
"start_date_in_millis" : -1,
"cluster_needs_tls" : true,
"uid" : "2a18bf38-a9bb-4e39-81b5-fb5fae31b426",
"issued_to" : "elasticsearch",
"expiry_date_in_millis" : 1576720530299,
"issue_date" : "2019-11-19T01:55:30.299Z"
}
}
}
]
}
}
0c6ceb3
to
7935701
Compare
jenkins, test this |
Travis CI is green and Jenkins CI failures are unrelated. Merging. |
* Fix license ID field name (elastic#14592) * Fix license ID field name * Adding CHANGELOG entry * Fixing up CHANGELOG
This PR fixes the license ID field name from
id
touid
. This makes Metricbeat-indexed stack monitoring documents have parity with internally-indexed ones.Testing this PR
elasticsearch-xpack
Metricbeat module..monitoring-es-*-mb-*
oftype: cluster_stats
has thelicense.uid
field.