Add `access` format support for Elasticsearch notification target (#4006)
This change adds `access` format support for notifications to a
Elasticsearch server, and it refactors `namespace` format support.
In the case of `access` format, for each event in Minio, a JSON
document is inserted into Elasticsearch with its timestamp set to the
event's timestamp, and with the ID generated automatically by
elasticsearch. No events are modified or deleted in this mode.
In the case of `namespace` format, for each event in Minio, a JSON
document is keyed together by the bucket and object name is updated in
Elasticsearch. In the case of an object being created or over-written
in Minio, a new document or an existing document is inserted into the
Elasticsearch index. If an object is deleted in Minio, the
corresponding document is deleted from the Elasticsearch index.
Additionally, this change upgrades Elasticsearch support to the 5.x
series. This is a breaking change, and users of previous elasticsearch
versions should upgrade.
Also updates documentation on Elasticsearch notification target usage
and has a link to an elasticsearch upgrade guide.
This is the last patch that finally resolves #3928.
2017-03-31 23:11:27 +02:00
|
|
|
// Copyright 2012-present Oliver Eilhard. All rights reserved.
|
2016-07-24 07:51:12 +02:00
|
|
|
// Use of this source code is governed by a MIT-license.
|
|
|
|
// See http://olivere.mit-license.org/license.txt for details.
|
|
|
|
|
|
|
|
package elastic
|
|
|
|
|
|
|
|
// DisMaxQuery is a query that generates the union of documents produced by
|
|
|
|
// its subqueries, and that scores each document with the maximum score
|
|
|
|
// for that document as produced by any subquery, plus a tie breaking
|
|
|
|
// increment for any additional matching subqueries.
|
|
|
|
//
|
|
|
|
// For more details, see:
|
Add `access` format support for Elasticsearch notification target (#4006)
This change adds `access` format support for notifications to a
Elasticsearch server, and it refactors `namespace` format support.
In the case of `access` format, for each event in Minio, a JSON
document is inserted into Elasticsearch with its timestamp set to the
event's timestamp, and with the ID generated automatically by
elasticsearch. No events are modified or deleted in this mode.
In the case of `namespace` format, for each event in Minio, a JSON
document is keyed together by the bucket and object name is updated in
Elasticsearch. In the case of an object being created or over-written
in Minio, a new document or an existing document is inserted into the
Elasticsearch index. If an object is deleted in Minio, the
corresponding document is deleted from the Elasticsearch index.
Additionally, this change upgrades Elasticsearch support to the 5.x
series. This is a breaking change, and users of previous elasticsearch
versions should upgrade.
Also updates documentation on Elasticsearch notification target usage
and has a link to an elasticsearch upgrade guide.
This is the last patch that finally resolves #3928.
2017-03-31 23:11:27 +02:00
|
|
|
// https://www.elastic.co/guide/en/elasticsearch/reference/5.2/query-dsl-dis-max-query.html
|
2016-07-24 07:51:12 +02:00
|
|
|
type DisMaxQuery struct {
|
|
|
|
queries []Query
|
|
|
|
boost *float64
|
|
|
|
tieBreaker *float64
|
|
|
|
queryName string
|
|
|
|
}
|
|
|
|
|
|
|
|
// NewDisMaxQuery creates and initializes a new dis max query.
|
|
|
|
func NewDisMaxQuery() *DisMaxQuery {
|
|
|
|
return &DisMaxQuery{
|
|
|
|
queries: make([]Query, 0),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Query adds one or more queries to the dis max query.
|
|
|
|
func (q *DisMaxQuery) Query(queries ...Query) *DisMaxQuery {
|
|
|
|
q.queries = append(q.queries, queries...)
|
|
|
|
return q
|
|
|
|
}
|
|
|
|
|
|
|
|
// Boost sets the boost for this query. Documents matching this query will
|
|
|
|
// (in addition to the normal weightings) have their score multiplied by
|
|
|
|
// the boost provided.
|
|
|
|
func (q *DisMaxQuery) Boost(boost float64) *DisMaxQuery {
|
|
|
|
q.boost = &boost
|
|
|
|
return q
|
|
|
|
}
|
|
|
|
|
|
|
|
// TieBreaker is the factor by which the score of each non-maximum disjunct
|
|
|
|
// for a document is multiplied with and added into the final score.
|
|
|
|
//
|
|
|
|
// If non-zero, the value should be small, on the order of 0.1, which says
|
|
|
|
// that 10 occurrences of word in a lower-scored field that is also in a
|
|
|
|
// higher scored field is just as good as a unique word in the lower scored
|
|
|
|
// field (i.e., one that is not in any higher scored field).
|
|
|
|
func (q *DisMaxQuery) TieBreaker(tieBreaker float64) *DisMaxQuery {
|
|
|
|
q.tieBreaker = &tieBreaker
|
|
|
|
return q
|
|
|
|
}
|
|
|
|
|
|
|
|
// QueryName sets the query name for the filter that can be used
|
|
|
|
// when searching for matched filters per hit.
|
|
|
|
func (q *DisMaxQuery) QueryName(queryName string) *DisMaxQuery {
|
|
|
|
q.queryName = queryName
|
|
|
|
return q
|
|
|
|
}
|
|
|
|
|
|
|
|
// Source returns the JSON serializable content for this query.
|
|
|
|
func (q *DisMaxQuery) Source() (interface{}, error) {
|
|
|
|
// {
|
|
|
|
// "dis_max" : {
|
|
|
|
// "tie_breaker" : 0.7,
|
|
|
|
// "boost" : 1.2,
|
|
|
|
// "queries" : {
|
|
|
|
// {
|
|
|
|
// "term" : { "age" : 34 }
|
|
|
|
// },
|
|
|
|
// {
|
|
|
|
// "term" : { "age" : 35 }
|
|
|
|
// }
|
|
|
|
// ]
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
|
|
|
|
query := make(map[string]interface{})
|
|
|
|
params := make(map[string]interface{})
|
|
|
|
query["dis_max"] = params
|
|
|
|
|
|
|
|
if q.tieBreaker != nil {
|
|
|
|
params["tie_breaker"] = *q.tieBreaker
|
|
|
|
}
|
|
|
|
if q.boost != nil {
|
|
|
|
params["boost"] = *q.boost
|
|
|
|
}
|
|
|
|
if q.queryName != "" {
|
|
|
|
params["_name"] = q.queryName
|
|
|
|
}
|
|
|
|
|
|
|
|
// queries
|
Add `access` format support for Elasticsearch notification target (#4006)
This change adds `access` format support for notifications to a
Elasticsearch server, and it refactors `namespace` format support.
In the case of `access` format, for each event in Minio, a JSON
document is inserted into Elasticsearch with its timestamp set to the
event's timestamp, and with the ID generated automatically by
elasticsearch. No events are modified or deleted in this mode.
In the case of `namespace` format, for each event in Minio, a JSON
document is keyed together by the bucket and object name is updated in
Elasticsearch. In the case of an object being created or over-written
in Minio, a new document or an existing document is inserted into the
Elasticsearch index. If an object is deleted in Minio, the
corresponding document is deleted from the Elasticsearch index.
Additionally, this change upgrades Elasticsearch support to the 5.x
series. This is a breaking change, and users of previous elasticsearch
versions should upgrade.
Also updates documentation on Elasticsearch notification target usage
and has a link to an elasticsearch upgrade guide.
This is the last patch that finally resolves #3928.
2017-03-31 23:11:27 +02:00
|
|
|
var clauses []interface{}
|
2016-07-24 07:51:12 +02:00
|
|
|
for _, subQuery := range q.queries {
|
|
|
|
src, err := subQuery.Source()
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
clauses = append(clauses, src)
|
|
|
|
}
|
|
|
|
params["queries"] = clauses
|
|
|
|
|
|
|
|
return query, nil
|
|
|
|
}
|