From 86cfe01f55b4680169a4f1a515034cf1ab5d9c81 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Tue, 24 Jul 2018 06:48:41 -0700 Subject: [PATCH 1/6] Report kibana_settings to X-Pack Monitoring --- NOTICE.txt | 15 + metricbeat/module/kibana/kibana.go | 26 +- .../kibana/stats/_meta/test/settings.700.json | 18 ++ metricbeat/module/kibana/stats/data_xpack.go | 70 +++-- .../module/kibana/stats/data_xpack_test.go | 26 +- metricbeat/module/kibana/stats/stats.go | 70 ++++- .../github.com/coreos/go-semver/LICENSE | 202 ++++++++++++ .../vendor/github.com/coreos/go-semver/NOTICE | 5 + .../coreos/go-semver/semver/semver.go | 296 ++++++++++++++++++ .../coreos/go-semver/semver/sort.go | 38 +++ metricbeat/vendor/vendor.json | 6 + 11 files changed, 731 insertions(+), 41 deletions(-) create mode 100644 metricbeat/module/kibana/stats/_meta/test/settings.700.json create mode 100644 metricbeat/vendor/github.com/coreos/go-semver/LICENSE create mode 100644 metricbeat/vendor/github.com/coreos/go-semver/NOTICE create mode 100644 metricbeat/vendor/github.com/coreos/go-semver/semver/semver.go create mode 100644 metricbeat/vendor/github.com/coreos/go-semver/semver/sort.go diff --git a/NOTICE.txt b/NOTICE.txt index 7e556dc94b0..377af8d4eb2 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -171,6 +171,21 @@ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +-------------------------------------------------------------------- +Dependency: github.com/coreos/go-semver +Revision: e214231b295a8ea9479f11b70b35d5acf3556d9b +License type (autodetected): Apache-2.0 +./metricbeat/vendor/github.com/coreos/go-semver/LICENSE: +-------------------------------------------------------------------- +Apache License 2.0 + +-------NOTICE----- +CoreOS Project +Copyright 2018 CoreOS, Inc + +This product includes software developed at CoreOS, Inc. +(http://www.coreos.com/). + -------------------------------------------------------------------- Dependency: github.com/davecgh/go-spew Version: v1.1.0 diff --git a/metricbeat/module/kibana/kibana.go b/metricbeat/module/kibana/kibana.go index 373ca6fe465..34075259e3e 100644 --- a/metricbeat/module/kibana/kibana.go +++ b/metricbeat/module/kibana/kibana.go @@ -29,8 +29,13 @@ import ( "github.com/elastic/beats/metricbeat/mb" ) -// StatsAPIAvailableVersion is the version of Kibana since when the stats API is available -const StatsAPIAvailableVersion = "6.4.0" +const ( + // StatsAPIAvailableVersion is the version of Kibana since when the stats API is available + StatsAPIAvailableVersion = "6.4.0" + + // SettingsAPIAvailableVersion is the version of Kibana since when the settings API is available + SettingsAPIAvailableVersion = "6.5.0" +) // ReportErrorForMissingField reports and returns an error message for the given // field being missing in API response received from Kibana @@ -67,14 +72,13 @@ func GetVersion(http *helper.HTTP, currentPath string) (string, error) { return versionStr, nil } -// IsStatsAPIAvailable returns whether the stats API is available in the given version of Kibana -func IsStatsAPIAvailable(kibanaVersion string) (bool, error) { - currentVersion, err := common.NewVersion(kibanaVersion) +func isKibanaAPIAvailable(currentKibanaVersion, apiAvailableInKibanaVersion string) (bool, error) { + currentVersion, err := common.NewVersion(currentKibanaVersion) if err != nil { return false, err } - wantVersion, err := common.NewVersion(StatsAPIAvailableVersion) + wantVersion, err := common.NewVersion(apiAvailableInKibanaVersion) if err != nil { return false, err } @@ -82,6 +86,16 @@ func IsStatsAPIAvailable(kibanaVersion string) (bool, error) { return !currentVersion.LessThan(wantVersion), nil } +// IsStatsAPIAvailable returns whether the stats API is available in the given version of Kibana +func IsStatsAPIAvailable(currentKibanaVersion string) (bool, error) { + return isKibanaAPIAvailable(currentKibanaVersion, StatsAPIAvailableVersion) +} + +// IsSettingsAPIAvailable returns whether the settings API is available in the given version of Kibana +func IsSettingsAPIAvailable(currentKibanaVersion string) (bool, error) { + return isKibanaAPIAvailable(currentKibanaVersion, SettingsAPIAvailableVersion) +} + func fetchPath(http *helper.HTTP, currentPath, newPath string) ([]byte, error) { currentURI := http.GetURI() defer http.SetURI(currentURI) // Reset after this request diff --git a/metricbeat/module/kibana/stats/_meta/test/settings.700.json b/metricbeat/module/kibana/stats/_meta/test/settings.700.json new file mode 100644 index 00000000000..845ae9f6a15 --- /dev/null +++ b/metricbeat/module/kibana/stats/_meta/test/settings.700.json @@ -0,0 +1,18 @@ +{ + "cluster_uuid":"u5ii0pnQRka_P0gimfmthg", + "settings":{ + "xpack":{ + "default_admin_email":"jane@doe.com" + }, + "kibana":{ + "uuid":"5b2de169-2785-441b-ae8c-186a1936b17d", + "name":"Janes-MBP-2", + "index":".kibana", + "host":"localhost", + "transport_address":"localhost:5601", + "version":"7.0.0-alpha1", + "snapshot":false, + "status":"green" + } + } + } diff --git a/metricbeat/module/kibana/stats/data_xpack.go b/metricbeat/module/kibana/stats/data_xpack.go index d08dcaab5cf..c2168e45faf 100644 --- a/metricbeat/module/kibana/stats/data_xpack.go +++ b/metricbeat/module/kibana/stats/data_xpack.go @@ -26,10 +26,11 @@ import ( c "github.com/elastic/beats/libbeat/common/schema/mapstriface" "github.com/elastic/beats/metricbeat/helper/elastic" "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/metricbeat/module/kibana" ) var ( - schemaXPackMonitoring = s.Schema{ + schemaXPackMonitoringStats = s.Schema{ "concurrent_connections": c.Int("concurrent_connections"), "os": c.Dict("os", s.Schema{ "load": c.Dict("load", s.Schema{ @@ -105,61 +106,86 @@ var ( } ) -func eventMappingXPack(r mb.ReporterV2, intervalMs int64, content []byte) error { - var data map[string]interface{} - err := json.Unmarshal(content, &data) - if err != nil { - r.Error(err) - return err - } +type dataParser func(mb.ReporterV2, common.MapStr, time.Time) (string, common.MapStr, error) - kibanaStatsFields, err := schemaXPackMonitoring.Apply(data) +func statsDataParser(r mb.ReporterV2, data common.MapStr, now time.Time) (string, common.MapStr, error) { + kibanaStatsFields, err := schemaXPackMonitoringStats.Apply(data) if err != nil { - r.Error(err) - return err + return "", nil, err } process, ok := data["process"].(map[string]interface{}) if !ok { - return elastic.ReportErrorForMissingField("process", elastic.Kibana, r) + return "", nil, kibana.ReportErrorForMissingField("process", r) } memory, ok := process["memory"].(map[string]interface{}) if !ok { - return elastic.ReportErrorForMissingField("process.memory", elastic.Kibana, r) + return "", nil, kibana.ReportErrorForMissingField("process.memory", r) } - rss, ok := memory["resident_set_size_bytes"].(float64) if !ok { - return elastic.ReportErrorForMissingField("process.memory.resident_set_size_bytes", elastic.Kibana, r) + return "", nil, kibana.ReportErrorForMissingField("process.memory.resident_set_size_bytes", r) } kibanaStatsFields.Put("process.memory.resident_set_size_in_bytes", int64(rss)) - timestamp := time.Now() - kibanaStatsFields.Put("timestamp", timestamp) + kibanaStatsFields.Put("timestamp", now) // Make usage field passthrough as-is usage, ok := data["usage"].(map[string]interface{}) if !ok { - return elastic.ReportErrorForMissingField("usage", elastic.Kibana, r) + return "", nil, elastic.ReportErrorForMissingField("usage", elastic.Kibana, r) } kibanaStatsFields.Put("usage", usage) + return "kibana_stats", kibanaStatsFields, nil +} + +func settingsDataParser(r mb.ReporterV2, data common.MapStr, now time.Time) (string, common.MapStr, error) { + kibanaSettingsFields, ok := data["settings"] + if !ok { + return "", nil, kibana.ReportErrorForMissingField("settiings", r) + } + + return "kibana_settings", kibanaSettingsFields.(map[string]interface{}), nil +} + +func eventMappingXPack(r mb.ReporterV2, intervalMs int64, now time.Time, content []byte, dataParserFunc dataParser) error { + var data map[string]interface{} + err := json.Unmarshal(content, &data) + if err != nil { + r.Error(err) + return err + } + clusterUUID, ok := data["clusterUuid"].(string) if !ok { return elastic.ReportErrorForMissingField("clusterUuid", elastic.Kibana, r) } + t, fields, err := dataParserFunc(r, data, now) + if err != nil { + return err + } + var event mb.Event event.RootFields = common.MapStr{ "cluster_uuid": clusterUUID, - "timestamp": timestamp, + "timestamp": now, "interval_ms": intervalMs, - "type": "kibana_stats", - "kibana_stats": kibanaStatsFields, + "type": t, + t: fields, } event.Index = elastic.MakeXPackMonitoringIndexName(elastic.Kibana) - r.Event(event) + r.Event(event) return nil } + +func eventMappingStatsXPack(r mb.ReporterV2, intervalMs int64, now time.Time, content []byte) error { + return eventMappingXPack(r, intervalMs, now, content, statsDataParser) +} + +func eventMappingSettingsXPack(r mb.ReporterV2, intervalMs int64, now time.Time, content []byte) error { + return eventMappingXPack(r, intervalMs, now, content, settingsDataParser) +} diff --git a/metricbeat/module/kibana/stats/data_xpack_test.go b/metricbeat/module/kibana/stats/data_xpack_test.go index 0148c712fd0..9d38e037441 100644 --- a/metricbeat/module/kibana/stats/data_xpack_test.go +++ b/metricbeat/module/kibana/stats/data_xpack_test.go @@ -23,13 +23,14 @@ import ( "io/ioutil" "path/filepath" "testing" + "time" mbtest "github.com/elastic/beats/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) -func TestEventMappingXPack(t *testing.T) { +func TestEventMappingStatsXPack(t *testing.T) { files, err := filepath.Glob("./_meta/test/stats-legacy.*.json") assert.NoError(t, err) @@ -39,7 +40,28 @@ func TestEventMappingXPack(t *testing.T) { assert.NoError(t, err) reporter := &mbtest.CapturingReporterV2{} - err = eventMappingXPack(reporter, 10000, input) + now := time.Now() + + err = eventMappingStatsXPack(reporter, 10000, now, input) + assert.NoError(t, err, f) + assert.True(t, len(reporter.GetEvents()) >= 1, f) + assert.Equal(t, 0, len(reporter.GetErrors()), f) + } +} + +func TestEventMappingSettingsXPack(t *testing.T) { + + files, err := filepath.Glob("./_meta/test/settings.*.json") + assert.NoError(t, err) + + for _, f := range files { + input, err := ioutil.ReadFile(f) + assert.NoError(t, err) + + reporter := &mbtest.CapturingReporterV2{} + now := time.Now() + + err = eventMappingSettingsXPack(reporter, 10000, now, input) assert.NoError(t, err, f) assert.True(t, len(reporter.GetEvents()) >= 1, f) assert.Equal(t, 0, len(reporter.GetErrors()), f) diff --git a/metricbeat/module/kibana/stats/stats.go b/metricbeat/module/kibana/stats/stats.go index 5869f65fecb..adf36fd0c80 100644 --- a/metricbeat/module/kibana/stats/stats.go +++ b/metricbeat/module/kibana/stats/stats.go @@ -19,6 +19,8 @@ package stats import ( "fmt" + "strings" + "time" "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/helper" @@ -36,7 +38,8 @@ func init() { } const ( - statsPath = "api/stats" + statsPath = "api/stats" + settingsPath = "api/settings" ) var ( @@ -50,7 +53,8 @@ var ( // MetricSet type defines all fields of the MetricSet type MetricSet struct { mb.BaseMetricSet - http *helper.HTTP + statsHTTP *helper.HTTP + settingsHTTP *helper.HTTP xPackEnabled bool } @@ -63,22 +67,22 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) { return nil, err } - http, err := helper.NewHTTP(base) + statsHTTP, err := helper.NewHTTP(base) if err != nil { return nil, err } - kibanaVersion, err := kibana.GetVersion(http, statsPath) + kibanaVersion, err := kibana.GetVersion(statsHTTP, statsPath) if err != nil { return nil, err } - isAPIAvailable, err := kibana.IsStatsAPIAvailable(kibanaVersion) + isStatsAPIAvailable, err := kibana.IsStatsAPIAvailable(kibanaVersion) if err != nil { return nil, err } - if !isAPIAvailable { + if !isStatsAPIAvailable { const errorMsg = "The kibana stats metricset is only supported with Kibana >= %v. You are currently running Kibana %v" return nil, fmt.Errorf(errorMsg, kibana.StatsAPIAvailableVersion, kibanaVersion) } @@ -87,12 +91,38 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) { cfgwarn.Experimental("The experimental xpack.enabled flag in kibana/stats metricset is enabled.") // Use legacy API response so we can passthru usage as-is - http.SetURI(http.GetURI() + "&legacy=true") + statsHTTP.SetURI(statsHTTP.GetURI() + "&legacy=true") + } + + var settingsHTTP *helper.HTTP + if config.XPackEnabled { + cfgwarn.Experimental("The experimental xpack.enabled flag in kibana/stats metricset is enabled.") + + isSettingsAPIAvailable, err := kibana.IsSettingsAPIAvailable(kibanaVersion) + if err != nil { + return nil, err + } + + if !isSettingsAPIAvailable { + const errorMsg = "The kibana stats metricset with X-Pack enabled is only supported with Kibana >= %v. You are currently running Kibana %v" + return nil, fmt.Errorf(errorMsg, kibana.SettingsAPIAvailableVersion, kibanaVersion) + } + + settingsHTTP, err = helper.NewHTTP(base) + if err != nil { + return nil, err + } + + // HACK! We need to do this because there might be a basepath involved, so we + // only search/replace the actual API paths + settingsURI := strings.Replace(statsHTTP.GetURI(), statsPath, settingsPath, 1) + settingsHTTP.SetURI(settingsURI) } return &MetricSet{ base, - http, + statsHTTP, + settingsHTTP, config.XPackEnabled, }, nil } @@ -101,17 +131,35 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) { // It returns the event which is then forward to the output. In case of an error, a // descriptive error must be returned. func (m *MetricSet) Fetch(r mb.ReporterV2) { - content, err := m.http.FetchContent() + intervalMs := m.Module().Config().Period.Nanoseconds() / 1000 / 1000 + now := time.Now() + + m.fetchStats(r, intervalMs, now) + if m.xPackEnabled { + m.fetchSettings(r, intervalMs, now) + } +} + +func (m *MetricSet) fetchStats(r mb.ReporterV2, intervalMs int64, now time.Time) { + content, err := m.statsHTTP.FetchContent() if err != nil { r.Error(err) return } if m.xPackEnabled { - intervalMs := m.Module().Config().Period.Nanoseconds() / 1000 / 1000 - eventMappingXPack(r, intervalMs, content) + eventMappingStatsXPack(r, intervalMs, now, content) } else { eventMapping(r, content) } +} + +func (m *MetricSet) fetchSettings(r mb.ReporterV2, intervalMs int64, now time.Time) { + content, err := m.settingsHTTP.FetchContent() + if err != nil { + r.Error(err) + return + } + eventMappingSettingsXPack(r, intervalMs, now, content) } diff --git a/metricbeat/vendor/github.com/coreos/go-semver/LICENSE b/metricbeat/vendor/github.com/coreos/go-semver/LICENSE new file mode 100644 index 00000000000..d6456956733 --- /dev/null +++ b/metricbeat/vendor/github.com/coreos/go-semver/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/metricbeat/vendor/github.com/coreos/go-semver/NOTICE b/metricbeat/vendor/github.com/coreos/go-semver/NOTICE new file mode 100644 index 00000000000..23a0ada2fbb --- /dev/null +++ b/metricbeat/vendor/github.com/coreos/go-semver/NOTICE @@ -0,0 +1,5 @@ +CoreOS Project +Copyright 2018 CoreOS, Inc + +This product includes software developed at CoreOS, Inc. +(http://www.coreos.com/). diff --git a/metricbeat/vendor/github.com/coreos/go-semver/semver/semver.go b/metricbeat/vendor/github.com/coreos/go-semver/semver/semver.go new file mode 100644 index 00000000000..76cf4852c76 --- /dev/null +++ b/metricbeat/vendor/github.com/coreos/go-semver/semver/semver.go @@ -0,0 +1,296 @@ +// Copyright 2013-2015 CoreOS, Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Semantic Versions http://semver.org +package semver + +import ( + "bytes" + "errors" + "fmt" + "regexp" + "strconv" + "strings" +) + +type Version struct { + Major int64 + Minor int64 + Patch int64 + PreRelease PreRelease + Metadata string +} + +type PreRelease string + +func splitOff(input *string, delim string) (val string) { + parts := strings.SplitN(*input, delim, 2) + + if len(parts) == 2 { + *input = parts[0] + val = parts[1] + } + + return val +} + +func New(version string) *Version { + return Must(NewVersion(version)) +} + +func NewVersion(version string) (*Version, error) { + v := Version{} + + if err := v.Set(version); err != nil { + return nil, err + } + + return &v, nil +} + +// Must is a helper for wrapping NewVersion and will panic if err is not nil. +func Must(v *Version, err error) *Version { + if err != nil { + panic(err) + } + return v +} + +// Set parses and updates v from the given version string. Implements flag.Value +func (v *Version) Set(version string) error { + metadata := splitOff(&version, "+") + preRelease := PreRelease(splitOff(&version, "-")) + dotParts := strings.SplitN(version, ".", 3) + + if len(dotParts) != 3 { + return fmt.Errorf("%s is not in dotted-tri format", version) + } + + if err := validateIdentifier(string(preRelease)); err != nil { + return fmt.Errorf("failed to validate pre-release: %v", err) + } + + if err := validateIdentifier(metadata); err != nil { + return fmt.Errorf("failed to validate metadata: %v", err) + } + + parsed := make([]int64, 3, 3) + + for i, v := range dotParts[:3] { + val, err := strconv.ParseInt(v, 10, 64) + parsed[i] = val + if err != nil { + return err + } + } + + v.Metadata = metadata + v.PreRelease = preRelease + v.Major = parsed[0] + v.Minor = parsed[1] + v.Patch = parsed[2] + return nil +} + +func (v Version) String() string { + var buffer bytes.Buffer + + fmt.Fprintf(&buffer, "%d.%d.%d", v.Major, v.Minor, v.Patch) + + if v.PreRelease != "" { + fmt.Fprintf(&buffer, "-%s", v.PreRelease) + } + + if v.Metadata != "" { + fmt.Fprintf(&buffer, "+%s", v.Metadata) + } + + return buffer.String() +} + +func (v *Version) UnmarshalYAML(unmarshal func(interface{}) error) error { + var data string + if err := unmarshal(&data); err != nil { + return err + } + return v.Set(data) +} + +func (v Version) MarshalJSON() ([]byte, error) { + return []byte(`"` + v.String() + `"`), nil +} + +func (v *Version) UnmarshalJSON(data []byte) error { + l := len(data) + if l == 0 || string(data) == `""` { + return nil + } + if l < 2 || data[0] != '"' || data[l-1] != '"' { + return errors.New("invalid semver string") + } + return v.Set(string(data[1 : l-1])) +} + +// Compare tests if v is less than, equal to, or greater than versionB, +// returning -1, 0, or +1 respectively. +func (v Version) Compare(versionB Version) int { + if cmp := recursiveCompare(v.Slice(), versionB.Slice()); cmp != 0 { + return cmp + } + return preReleaseCompare(v, versionB) +} + +// Equal tests if v is equal to versionB. +func (v Version) Equal(versionB Version) bool { + return v.Compare(versionB) == 0 +} + +// LessThan tests if v is less than versionB. +func (v Version) LessThan(versionB Version) bool { + return v.Compare(versionB) < 0 +} + +// Slice converts the comparable parts of the semver into a slice of integers. +func (v Version) Slice() []int64 { + return []int64{v.Major, v.Minor, v.Patch} +} + +func (p PreRelease) Slice() []string { + preRelease := string(p) + return strings.Split(preRelease, ".") +} + +func preReleaseCompare(versionA Version, versionB Version) int { + a := versionA.PreRelease + b := versionB.PreRelease + + /* Handle the case where if two versions are otherwise equal it is the + * one without a PreRelease that is greater */ + if len(a) == 0 && (len(b) > 0) { + return 1 + } else if len(b) == 0 && (len(a) > 0) { + return -1 + } + + // If there is a prerelease, check and compare each part. + return recursivePreReleaseCompare(a.Slice(), b.Slice()) +} + +func recursiveCompare(versionA []int64, versionB []int64) int { + if len(versionA) == 0 { + return 0 + } + + a := versionA[0] + b := versionB[0] + + if a > b { + return 1 + } else if a < b { + return -1 + } + + return recursiveCompare(versionA[1:], versionB[1:]) +} + +func recursivePreReleaseCompare(versionA []string, versionB []string) int { + // A larger set of pre-release fields has a higher precedence than a smaller set, + // if all of the preceding identifiers are equal. + if len(versionA) == 0 { + if len(versionB) > 0 { + return -1 + } + return 0 + } else if len(versionB) == 0 { + // We're longer than versionB so return 1. + return 1 + } + + a := versionA[0] + b := versionB[0] + + aInt := false + bInt := false + + aI, err := strconv.Atoi(versionA[0]) + if err == nil { + aInt = true + } + + bI, err := strconv.Atoi(versionB[0]) + if err == nil { + bInt = true + } + + // Numeric identifiers always have lower precedence than non-numeric identifiers. + if aInt && !bInt { + return -1 + } else if !aInt && bInt { + return 1 + } + + // Handle Integer Comparison + if aInt && bInt { + if aI > bI { + return 1 + } else if aI < bI { + return -1 + } + } + + // Handle String Comparison + if a > b { + return 1 + } else if a < b { + return -1 + } + + return recursivePreReleaseCompare(versionA[1:], versionB[1:]) +} + +// BumpMajor increments the Major field by 1 and resets all other fields to their default values +func (v *Version) BumpMajor() { + v.Major += 1 + v.Minor = 0 + v.Patch = 0 + v.PreRelease = PreRelease("") + v.Metadata = "" +} + +// BumpMinor increments the Minor field by 1 and resets all other fields to their default values +func (v *Version) BumpMinor() { + v.Minor += 1 + v.Patch = 0 + v.PreRelease = PreRelease("") + v.Metadata = "" +} + +// BumpPatch increments the Patch field by 1 and resets all other fields to their default values +func (v *Version) BumpPatch() { + v.Patch += 1 + v.PreRelease = PreRelease("") + v.Metadata = "" +} + +// validateIdentifier makes sure the provided identifier satisfies semver spec +func validateIdentifier(id string) error { + if id != "" && !reIdentifier.MatchString(id) { + return fmt.Errorf("%s is not a valid semver identifier", id) + } + return nil +} + +// reIdentifier is a regular expression used to check that pre-release and metadata +// identifiers satisfy the spec requirements +var reIdentifier = regexp.MustCompile(`^[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*$`) diff --git a/metricbeat/vendor/github.com/coreos/go-semver/semver/sort.go b/metricbeat/vendor/github.com/coreos/go-semver/semver/sort.go new file mode 100644 index 00000000000..e256b41a5dd --- /dev/null +++ b/metricbeat/vendor/github.com/coreos/go-semver/semver/sort.go @@ -0,0 +1,38 @@ +// Copyright 2013-2015 CoreOS, Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package semver + +import ( + "sort" +) + +type Versions []*Version + +func (s Versions) Len() int { + return len(s) +} + +func (s Versions) Swap(i, j int) { + s[i], s[j] = s[j], s[i] +} + +func (s Versions) Less(i, j int) bool { + return s[i].LessThan(*s[j]) +} + +// Sort sorts the given slice of Version +func Sort(versions []*Version) { + sort.Sort(Versions(versions)) +} diff --git a/metricbeat/vendor/vendor.json b/metricbeat/vendor/vendor.json index a6365e72c52..d6423744c7d 100644 --- a/metricbeat/vendor/vendor.json +++ b/metricbeat/vendor/vendor.json @@ -2,6 +2,12 @@ "comment": "", "ignore": "test github.com/elastic/beats", "package": [ + { + "checksumSHA1": "97BsbXOiZ8+Kr+LIuZkQFtSj7H4=", + "path": "github.com/coreos/go-semver/semver", + "revision": "e214231b295a8ea9479f11b70b35d5acf3556d9b", + "revisionTime": "2018-01-08T23:09:05Z" + }, { "checksumSHA1": "GYschMPw/Zi5C4QnGKRfgljnx/c=", "path": "github.com/gogo/protobuf/proto", From a59d59dff2cdbc13032e79a4fc7c3d8e5901c224 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Thu, 26 Jul 2018 14:25:29 -0700 Subject: [PATCH 2/6] Using common helper method --- metricbeat/module/kibana/stats/data_xpack.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/metricbeat/module/kibana/stats/data_xpack.go b/metricbeat/module/kibana/stats/data_xpack.go index c2168e45faf..7d29f7b72e1 100644 --- a/metricbeat/module/kibana/stats/data_xpack.go +++ b/metricbeat/module/kibana/stats/data_xpack.go @@ -26,7 +26,6 @@ import ( c "github.com/elastic/beats/libbeat/common/schema/mapstriface" "github.com/elastic/beats/metricbeat/helper/elastic" "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/kibana" ) var ( @@ -116,15 +115,15 @@ func statsDataParser(r mb.ReporterV2, data common.MapStr, now time.Time) (string process, ok := data["process"].(map[string]interface{}) if !ok { - return "", nil, kibana.ReportErrorForMissingField("process", r) + return "", nil, elastic.ReportErrorForMissingField("process", elastic.Kibana, r) } memory, ok := process["memory"].(map[string]interface{}) if !ok { - return "", nil, kibana.ReportErrorForMissingField("process.memory", r) + return "", nil, elastic.ReportErrorForMissingField("process.memory", elastic.Kibana, r) } rss, ok := memory["resident_set_size_bytes"].(float64) if !ok { - return "", nil, kibana.ReportErrorForMissingField("process.memory.resident_set_size_bytes", r) + return "", nil, elastic.ReportErrorForMissingField("process.memory.resident_set_size_bytes", elastic.Kibana, r) } kibanaStatsFields.Put("process.memory.resident_set_size_in_bytes", int64(rss)) @@ -143,7 +142,7 @@ func statsDataParser(r mb.ReporterV2, data common.MapStr, now time.Time) (string func settingsDataParser(r mb.ReporterV2, data common.MapStr, now time.Time) (string, common.MapStr, error) { kibanaSettingsFields, ok := data["settings"] if !ok { - return "", nil, kibana.ReportErrorForMissingField("settiings", r) + return "", nil, elastic.ReportErrorForMissingField("settings", elastic.Kibana, r) } return "kibana_settings", kibanaSettingsFields.(map[string]interface{}), nil From 828ba1ddf3b51fdece6f8a089999f8ec6b2fb93e Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Tue, 7 Aug 2018 11:57:09 -0700 Subject: [PATCH 3/6] Account for cluster_uuid vs. clusterUuid in Kibana API responses --- metricbeat/module/kibana/stats/data_xpack.go | 39 +++++++++++--------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/metricbeat/module/kibana/stats/data_xpack.go b/metricbeat/module/kibana/stats/data_xpack.go index 7d29f7b72e1..32a3bf0a883 100644 --- a/metricbeat/module/kibana/stats/data_xpack.go +++ b/metricbeat/module/kibana/stats/data_xpack.go @@ -105,25 +105,30 @@ var ( } ) -type dataParser func(mb.ReporterV2, common.MapStr, time.Time) (string, common.MapStr, error) +type dataParser func(mb.ReporterV2, common.MapStr, time.Time) (string, string, common.MapStr, error) + +func statsDataParser(r mb.ReporterV2, data common.MapStr, now time.Time) (string, string, common.MapStr, error) { + clusterUUID, ok := data["clusterUuid"].(string) + if !ok { + return "", "", nil, elastic.ReportErrorForMissingField("clusterUuid", elastic.Kibana, r) + } -func statsDataParser(r mb.ReporterV2, data common.MapStr, now time.Time) (string, common.MapStr, error) { kibanaStatsFields, err := schemaXPackMonitoringStats.Apply(data) if err != nil { - return "", nil, err + return "", "", nil, err } process, ok := data["process"].(map[string]interface{}) if !ok { - return "", nil, elastic.ReportErrorForMissingField("process", elastic.Kibana, r) + return "", "", nil, elastic.ReportErrorForMissingField("process", elastic.Kibana, r) } memory, ok := process["memory"].(map[string]interface{}) if !ok { - return "", nil, elastic.ReportErrorForMissingField("process.memory", elastic.Kibana, r) + return "", "", nil, elastic.ReportErrorForMissingField("process.memory", elastic.Kibana, r) } rss, ok := memory["resident_set_size_bytes"].(float64) if !ok { - return "", nil, elastic.ReportErrorForMissingField("process.memory.resident_set_size_bytes", elastic.Kibana, r) + return "", "", nil, elastic.ReportErrorForMissingField("process.memory.resident_set_size_bytes", elastic.Kibana, r) } kibanaStatsFields.Put("process.memory.resident_set_size_in_bytes", int64(rss)) @@ -132,20 +137,25 @@ func statsDataParser(r mb.ReporterV2, data common.MapStr, now time.Time) (string // Make usage field passthrough as-is usage, ok := data["usage"].(map[string]interface{}) if !ok { - return "", nil, elastic.ReportErrorForMissingField("usage", elastic.Kibana, r) + return "", "", nil, elastic.ReportErrorForMissingField("usage", elastic.Kibana, r) } kibanaStatsFields.Put("usage", usage) - return "kibana_stats", kibanaStatsFields, nil + return "kibana_stats", clusterUUID, kibanaStatsFields, nil } -func settingsDataParser(r mb.ReporterV2, data common.MapStr, now time.Time) (string, common.MapStr, error) { +func settingsDataParser(r mb.ReporterV2, data common.MapStr, now time.Time) (string, string, common.MapStr, error) { + clusterUUID, ok := data["cluster_uuid"].(string) + if !ok { + return "", "", nil, elastic.ReportErrorForMissingField("cluster_uuid", elastic.Kibana, r) + } + kibanaSettingsFields, ok := data["settings"] if !ok { - return "", nil, elastic.ReportErrorForMissingField("settings", elastic.Kibana, r) + return "", "", nil, elastic.ReportErrorForMissingField("settings", elastic.Kibana, r) } - return "kibana_settings", kibanaSettingsFields.(map[string]interface{}), nil + return "kibana_settings", clusterUUID, kibanaSettingsFields.(map[string]interface{}), nil } func eventMappingXPack(r mb.ReporterV2, intervalMs int64, now time.Time, content []byte, dataParserFunc dataParser) error { @@ -156,12 +166,7 @@ func eventMappingXPack(r mb.ReporterV2, intervalMs int64, now time.Time, content return err } - clusterUUID, ok := data["clusterUuid"].(string) - if !ok { - return elastic.ReportErrorForMissingField("clusterUuid", elastic.Kibana, r) - } - - t, fields, err := dataParserFunc(r, data, now) + t, clusterUUID, fields, err := dataParserFunc(r, data, now) if err != nil { return err } From 9101c9d76b4a9148154e86f0791ab3cc2cf43012 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Wed, 8 Aug 2018 10:41:22 -0700 Subject: [PATCH 4/6] Removing unused semver package --- NOTICE.txt | 15 - .../github.com/coreos/go-semver/LICENSE | 202 ------------ .../vendor/github.com/coreos/go-semver/NOTICE | 5 - .../coreos/go-semver/semver/semver.go | 296 ------------------ .../coreos/go-semver/semver/sort.go | 38 --- metricbeat/vendor/vendor.json | 6 - 6 files changed, 562 deletions(-) delete mode 100644 metricbeat/vendor/github.com/coreos/go-semver/LICENSE delete mode 100644 metricbeat/vendor/github.com/coreos/go-semver/NOTICE delete mode 100644 metricbeat/vendor/github.com/coreos/go-semver/semver/semver.go delete mode 100644 metricbeat/vendor/github.com/coreos/go-semver/semver/sort.go diff --git a/NOTICE.txt b/NOTICE.txt index 377af8d4eb2..7e556dc94b0 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -171,21 +171,6 @@ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --------------------------------------------------------------------- -Dependency: github.com/coreos/go-semver -Revision: e214231b295a8ea9479f11b70b35d5acf3556d9b -License type (autodetected): Apache-2.0 -./metricbeat/vendor/github.com/coreos/go-semver/LICENSE: --------------------------------------------------------------------- -Apache License 2.0 - --------NOTICE----- -CoreOS Project -Copyright 2018 CoreOS, Inc - -This product includes software developed at CoreOS, Inc. -(http://www.coreos.com/). - -------------------------------------------------------------------- Dependency: github.com/davecgh/go-spew Version: v1.1.0 diff --git a/metricbeat/vendor/github.com/coreos/go-semver/LICENSE b/metricbeat/vendor/github.com/coreos/go-semver/LICENSE deleted file mode 100644 index d6456956733..00000000000 --- a/metricbeat/vendor/github.com/coreos/go-semver/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/metricbeat/vendor/github.com/coreos/go-semver/NOTICE b/metricbeat/vendor/github.com/coreos/go-semver/NOTICE deleted file mode 100644 index 23a0ada2fbb..00000000000 --- a/metricbeat/vendor/github.com/coreos/go-semver/NOTICE +++ /dev/null @@ -1,5 +0,0 @@ -CoreOS Project -Copyright 2018 CoreOS, Inc - -This product includes software developed at CoreOS, Inc. -(http://www.coreos.com/). diff --git a/metricbeat/vendor/github.com/coreos/go-semver/semver/semver.go b/metricbeat/vendor/github.com/coreos/go-semver/semver/semver.go deleted file mode 100644 index 76cf4852c76..00000000000 --- a/metricbeat/vendor/github.com/coreos/go-semver/semver/semver.go +++ /dev/null @@ -1,296 +0,0 @@ -// Copyright 2013-2015 CoreOS, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// Semantic Versions http://semver.org -package semver - -import ( - "bytes" - "errors" - "fmt" - "regexp" - "strconv" - "strings" -) - -type Version struct { - Major int64 - Minor int64 - Patch int64 - PreRelease PreRelease - Metadata string -} - -type PreRelease string - -func splitOff(input *string, delim string) (val string) { - parts := strings.SplitN(*input, delim, 2) - - if len(parts) == 2 { - *input = parts[0] - val = parts[1] - } - - return val -} - -func New(version string) *Version { - return Must(NewVersion(version)) -} - -func NewVersion(version string) (*Version, error) { - v := Version{} - - if err := v.Set(version); err != nil { - return nil, err - } - - return &v, nil -} - -// Must is a helper for wrapping NewVersion and will panic if err is not nil. -func Must(v *Version, err error) *Version { - if err != nil { - panic(err) - } - return v -} - -// Set parses and updates v from the given version string. Implements flag.Value -func (v *Version) Set(version string) error { - metadata := splitOff(&version, "+") - preRelease := PreRelease(splitOff(&version, "-")) - dotParts := strings.SplitN(version, ".", 3) - - if len(dotParts) != 3 { - return fmt.Errorf("%s is not in dotted-tri format", version) - } - - if err := validateIdentifier(string(preRelease)); err != nil { - return fmt.Errorf("failed to validate pre-release: %v", err) - } - - if err := validateIdentifier(metadata); err != nil { - return fmt.Errorf("failed to validate metadata: %v", err) - } - - parsed := make([]int64, 3, 3) - - for i, v := range dotParts[:3] { - val, err := strconv.ParseInt(v, 10, 64) - parsed[i] = val - if err != nil { - return err - } - } - - v.Metadata = metadata - v.PreRelease = preRelease - v.Major = parsed[0] - v.Minor = parsed[1] - v.Patch = parsed[2] - return nil -} - -func (v Version) String() string { - var buffer bytes.Buffer - - fmt.Fprintf(&buffer, "%d.%d.%d", v.Major, v.Minor, v.Patch) - - if v.PreRelease != "" { - fmt.Fprintf(&buffer, "-%s", v.PreRelease) - } - - if v.Metadata != "" { - fmt.Fprintf(&buffer, "+%s", v.Metadata) - } - - return buffer.String() -} - -func (v *Version) UnmarshalYAML(unmarshal func(interface{}) error) error { - var data string - if err := unmarshal(&data); err != nil { - return err - } - return v.Set(data) -} - -func (v Version) MarshalJSON() ([]byte, error) { - return []byte(`"` + v.String() + `"`), nil -} - -func (v *Version) UnmarshalJSON(data []byte) error { - l := len(data) - if l == 0 || string(data) == `""` { - return nil - } - if l < 2 || data[0] != '"' || data[l-1] != '"' { - return errors.New("invalid semver string") - } - return v.Set(string(data[1 : l-1])) -} - -// Compare tests if v is less than, equal to, or greater than versionB, -// returning -1, 0, or +1 respectively. -func (v Version) Compare(versionB Version) int { - if cmp := recursiveCompare(v.Slice(), versionB.Slice()); cmp != 0 { - return cmp - } - return preReleaseCompare(v, versionB) -} - -// Equal tests if v is equal to versionB. -func (v Version) Equal(versionB Version) bool { - return v.Compare(versionB) == 0 -} - -// LessThan tests if v is less than versionB. -func (v Version) LessThan(versionB Version) bool { - return v.Compare(versionB) < 0 -} - -// Slice converts the comparable parts of the semver into a slice of integers. -func (v Version) Slice() []int64 { - return []int64{v.Major, v.Minor, v.Patch} -} - -func (p PreRelease) Slice() []string { - preRelease := string(p) - return strings.Split(preRelease, ".") -} - -func preReleaseCompare(versionA Version, versionB Version) int { - a := versionA.PreRelease - b := versionB.PreRelease - - /* Handle the case where if two versions are otherwise equal it is the - * one without a PreRelease that is greater */ - if len(a) == 0 && (len(b) > 0) { - return 1 - } else if len(b) == 0 && (len(a) > 0) { - return -1 - } - - // If there is a prerelease, check and compare each part. - return recursivePreReleaseCompare(a.Slice(), b.Slice()) -} - -func recursiveCompare(versionA []int64, versionB []int64) int { - if len(versionA) == 0 { - return 0 - } - - a := versionA[0] - b := versionB[0] - - if a > b { - return 1 - } else if a < b { - return -1 - } - - return recursiveCompare(versionA[1:], versionB[1:]) -} - -func recursivePreReleaseCompare(versionA []string, versionB []string) int { - // A larger set of pre-release fields has a higher precedence than a smaller set, - // if all of the preceding identifiers are equal. - if len(versionA) == 0 { - if len(versionB) > 0 { - return -1 - } - return 0 - } else if len(versionB) == 0 { - // We're longer than versionB so return 1. - return 1 - } - - a := versionA[0] - b := versionB[0] - - aInt := false - bInt := false - - aI, err := strconv.Atoi(versionA[0]) - if err == nil { - aInt = true - } - - bI, err := strconv.Atoi(versionB[0]) - if err == nil { - bInt = true - } - - // Numeric identifiers always have lower precedence than non-numeric identifiers. - if aInt && !bInt { - return -1 - } else if !aInt && bInt { - return 1 - } - - // Handle Integer Comparison - if aInt && bInt { - if aI > bI { - return 1 - } else if aI < bI { - return -1 - } - } - - // Handle String Comparison - if a > b { - return 1 - } else if a < b { - return -1 - } - - return recursivePreReleaseCompare(versionA[1:], versionB[1:]) -} - -// BumpMajor increments the Major field by 1 and resets all other fields to their default values -func (v *Version) BumpMajor() { - v.Major += 1 - v.Minor = 0 - v.Patch = 0 - v.PreRelease = PreRelease("") - v.Metadata = "" -} - -// BumpMinor increments the Minor field by 1 and resets all other fields to their default values -func (v *Version) BumpMinor() { - v.Minor += 1 - v.Patch = 0 - v.PreRelease = PreRelease("") - v.Metadata = "" -} - -// BumpPatch increments the Patch field by 1 and resets all other fields to their default values -func (v *Version) BumpPatch() { - v.Patch += 1 - v.PreRelease = PreRelease("") - v.Metadata = "" -} - -// validateIdentifier makes sure the provided identifier satisfies semver spec -func validateIdentifier(id string) error { - if id != "" && !reIdentifier.MatchString(id) { - return fmt.Errorf("%s is not a valid semver identifier", id) - } - return nil -} - -// reIdentifier is a regular expression used to check that pre-release and metadata -// identifiers satisfy the spec requirements -var reIdentifier = regexp.MustCompile(`^[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*$`) diff --git a/metricbeat/vendor/github.com/coreos/go-semver/semver/sort.go b/metricbeat/vendor/github.com/coreos/go-semver/semver/sort.go deleted file mode 100644 index e256b41a5dd..00000000000 --- a/metricbeat/vendor/github.com/coreos/go-semver/semver/sort.go +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright 2013-2015 CoreOS, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package semver - -import ( - "sort" -) - -type Versions []*Version - -func (s Versions) Len() int { - return len(s) -} - -func (s Versions) Swap(i, j int) { - s[i], s[j] = s[j], s[i] -} - -func (s Versions) Less(i, j int) bool { - return s[i].LessThan(*s[j]) -} - -// Sort sorts the given slice of Version -func Sort(versions []*Version) { - sort.Sort(Versions(versions)) -} diff --git a/metricbeat/vendor/vendor.json b/metricbeat/vendor/vendor.json index d6423744c7d..a6365e72c52 100644 --- a/metricbeat/vendor/vendor.json +++ b/metricbeat/vendor/vendor.json @@ -2,12 +2,6 @@ "comment": "", "ignore": "test github.com/elastic/beats", "package": [ - { - "checksumSHA1": "97BsbXOiZ8+Kr+LIuZkQFtSj7H4=", - "path": "github.com/coreos/go-semver/semver", - "revision": "e214231b295a8ea9479f11b70b35d5acf3556d9b", - "revisionTime": "2018-01-08T23:09:05Z" - }, { "checksumSHA1": "GYschMPw/Zi5C4QnGKRfgljnx/c=", "path": "github.com/gogo/protobuf/proto", From 011b7cfa8d3a684a15801eccb67260e6e4a99a1e Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Wed, 8 Aug 2018 10:44:41 -0700 Subject: [PATCH 5/6] Don't report error --- metricbeat/module/kibana/stats/data_xpack.go | 1 - metricbeat/module/kibana/stats/stats.go | 1 - 2 files changed, 2 deletions(-) diff --git a/metricbeat/module/kibana/stats/data_xpack.go b/metricbeat/module/kibana/stats/data_xpack.go index 32a3bf0a883..75594069c52 100644 --- a/metricbeat/module/kibana/stats/data_xpack.go +++ b/metricbeat/module/kibana/stats/data_xpack.go @@ -162,7 +162,6 @@ func eventMappingXPack(r mb.ReporterV2, intervalMs int64, now time.Time, content var data map[string]interface{} err := json.Unmarshal(content, &data) if err != nil { - r.Error(err) return err } diff --git a/metricbeat/module/kibana/stats/stats.go b/metricbeat/module/kibana/stats/stats.go index adf36fd0c80..42af0922598 100644 --- a/metricbeat/module/kibana/stats/stats.go +++ b/metricbeat/module/kibana/stats/stats.go @@ -157,7 +157,6 @@ func (m *MetricSet) fetchStats(r mb.ReporterV2, intervalMs int64, now time.Time) func (m *MetricSet) fetchSettings(r mb.ReporterV2, intervalMs int64, now time.Time) { content, err := m.settingsHTTP.FetchContent() if err != nil { - r.Error(err) return } From 3afa1a2a7ab58cf57888dd852ea68d8684695675 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Wed, 8 Aug 2018 10:55:22 -0700 Subject: [PATCH 6/6] Calculate interval only in the x-pack case --- metricbeat/module/kibana/stats/stats.go | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/metricbeat/module/kibana/stats/stats.go b/metricbeat/module/kibana/stats/stats.go index 42af0922598..38c20d0612a 100644 --- a/metricbeat/module/kibana/stats/stats.go +++ b/metricbeat/module/kibana/stats/stats.go @@ -131,16 +131,15 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) { // It returns the event which is then forward to the output. In case of an error, a // descriptive error must be returned. func (m *MetricSet) Fetch(r mb.ReporterV2) { - intervalMs := m.Module().Config().Period.Nanoseconds() / 1000 / 1000 now := time.Now() - m.fetchStats(r, intervalMs, now) + m.fetchStats(r, now) if m.xPackEnabled { - m.fetchSettings(r, intervalMs, now) + m.fetchSettings(r, now) } } -func (m *MetricSet) fetchStats(r mb.ReporterV2, intervalMs int64, now time.Time) { +func (m *MetricSet) fetchStats(r mb.ReporterV2, now time.Time) { content, err := m.statsHTTP.FetchContent() if err != nil { r.Error(err) @@ -148,17 +147,23 @@ func (m *MetricSet) fetchStats(r mb.ReporterV2, intervalMs int64, now time.Time) } if m.xPackEnabled { + intervalMs := m.calculateIntervalMs() eventMappingStatsXPack(r, intervalMs, now, content) } else { eventMapping(r, content) } } -func (m *MetricSet) fetchSettings(r mb.ReporterV2, intervalMs int64, now time.Time) { +func (m *MetricSet) fetchSettings(r mb.ReporterV2, now time.Time) { content, err := m.settingsHTTP.FetchContent() if err != nil { return } + intervalMs := m.calculateIntervalMs() eventMappingSettingsXPack(r, intervalMs, now, content) } + +func (m *MetricSet) calculateIntervalMs() int64 { + return m.Module().Config().Period.Nanoseconds() / 1000 / 1000 +}