Skip to content

Commit

Permalink
Merge branch 'master' into sarama
Browse files Browse the repository at this point in the history
  • Loading branch information
@faec
faec committed Sep 2, 2021
2 parents 67ebe95 + c9edc68 commit 54909cc
Show file tree
Hide file tree
Showing 16 changed files with 257 additions and 100 deletions.
Binary file modified metricbeat/docs/images/metricbeat-aws-rds-overview.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions metricbeat/module/system/process/process.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ package process

import (
"fmt"
"os"
"runtime"

"github.com/pkg/errors"
Expand Down Expand Up @@ -90,6 +91,15 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
perCPU: config.IncludePerCPU,
IsAgent: systemModule.IsAgent,
}

// If hostfs is set, we may not want to force the hierarchy override, as the user could be expecting a custom path.
if len(paths.Paths.Hostfs) < 2 {
override, isset := os.LookupEnv("LIBBEAT_MONITORING_CGROUPS_HIERARCHY_OVERRIDE")
if isset {
m.stats.CgroupOpts.CgroupsHierarchyOverride = override
}
}

err := m.stats.Init()
if err != nil {
return nil, err
Expand Down
0 ...stic-agent/pkg/agent/transpiler/utils..go → ...astic-agent/pkg/agent/transpiler/utils.go
View file
File renamed without changes.
93 changes: 45 additions & 48 deletions .../metricbeat/module/aws/_meta/kibana/7/dashboard/3367c170-921f-11e9-aa19-159bf182e06f.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,51 +22,52 @@
},
"gridData": {
"h": 7,
"i": "1",
"w": 17,
"x": 7,
"y": 0
},
"panelIndex": "1",
"panelRefName": "panel_1",
"title": "Database Connections",
"type": "visualization",
"version": "7.11.0"
},
{
"embeddableConfig": {
"enhancements": {}
},
"gridData": {
"h": 8,
"i": "5",
"w": 17,
"x": 7,
"y": 7
"w": 6,
"x": 0,
"y": 8
},
"panelIndex": "5",
"panelRefName": "panel_5",
"title": "Transaction Blocked",
"type": "visualization",
"version": "7.11.0"
"version": "7.14.0"
},
{
"embeddableConfig": {
"enhancements": {},
"hidePanelTitles": false
},
"gridData": {
"h": 15,
"h": 8,
"i": "6",
"w": 7,
"w": 6,
"x": 0,
"y": 0
},
"panelIndex": "6",
"panelRefName": "panel_6",
"title": "AWS Region Filter",
"title": "Filters",
"type": "visualization",
"version": "7.11.0"
"version": "7.14.0"
},
{
"embeddableConfig": {
"enhancements": {},
"hidePanelTitles": false
},
"gridData": {
"h": 15,
"i": "4abe34b0-e220-4d15-8da1-e32da039bd49",
"w": 18,
"x": 6,
"y": 0
},
"panelIndex": "4abe34b0-e220-4d15-8da1-e32da039bd49",
"panelRefName": "panel_4abe34b0-e220-4d15-8da1-e32da039bd49",
"title": "Database Connections",
"type": "lens",
"version": "7.14.0"
},
{
"embeddableConfig": {
Expand All @@ -84,7 +85,7 @@
"panelRefName": "panel_4d89e43f-299c-4f43-bde2-0ada0983ff23",
"title": "Free Storage",
"type": "lens",
"version": "7.11.0"
"version": "7.14.0"
},
{
"embeddableConfig": {
Expand All @@ -102,7 +103,7 @@
"panelRefName": "panel_d409ab5d-84b5-4ecc-86ae-1f79a882b626",
"title": "Read Latency",
"type": "lens",
"version": "7.11.0"
"version": "7.14.0"
},
{
"embeddableConfig": {
Expand Down Expand Up @@ -244,8 +245,7 @@
"visualizationType": "lnsXY"
},
"enhancements": {},
"hidePanelTitles": false,
"type": "lens"
"hidePanelTitles": false
},
"gridData": {
"h": 15,
Expand Down Expand Up @@ -274,9 +274,9 @@
},
"panelIndex": "c5476b0e-6a44-43e5-8bb4-0795c4d097c1",
"panelRefName": "panel_c5476b0e-6a44-43e5-8bb4-0795c4d097c1",
"title": "Insert Throughput",
"title": "Read Throughput",
"type": "lens",
"version": "7.11.0"
"version": "7.14.0"
},
{
"embeddableConfig": {
Expand All @@ -292,9 +292,9 @@
},
"panelIndex": "bf74bb77-3503-4682-9f0e-6df0994dce5d",
"panelRefName": "panel_bf74bb77-3503-4682-9f0e-6df0994dce5d",
"title": "Select Throughput",
"title": "Write Throughput",
"type": "lens",
"version": "7.11.0"
"version": "7.14.0"
},
{
"embeddableConfig": {
Expand Down Expand Up @@ -435,8 +435,7 @@
"visualizationType": "lnsXY"
},
"enhancements": {},
"hidePanelTitles": false,
"type": "lens"
"hidePanelTitles": false
},
"gridData": {
"h": 15,
Expand Down Expand Up @@ -591,8 +590,7 @@
"visualizationType": "lnsXY"
},
"enhancements": {},
"hidePanelTitles": false,
"type": "lens"
"hidePanelTitles": false
},
"gridData": {
"h": 15,
Expand Down Expand Up @@ -623,7 +621,7 @@
"panelRefName": "panel_29549114-6ebf-4047-aa56-bc035f66d3b4",
"title": "Write IOPS",
"type": "lens",
"version": "7.11.0"
"version": "7.14.0"
},
{
"embeddableConfig": {
Expand Down Expand Up @@ -749,8 +747,7 @@
"visualizationType": "lnsXY"
},
"enhancements": {},
"hidePanelTitles": false,
"type": "lens"
"hidePanelTitles": false
},
"gridData": {
"h": 15,
Expand All @@ -770,17 +767,12 @@
"title": "[Metricbeat AWS] RDS Overview",
"version": 1
},
"coreMigrationVersion": "8.0.0",
"coreMigrationVersion": "7.14.0",
"id": "3367c170-921f-11e9-aa19-159bf182e06f",
"migrationVersion": {
"dashboard": "7.14.0"
},
"references": [
{
"id": "17fcda50-921b-11e9-aa19-159bf182e06f",
"name": "1:panel_1",
"type": "visualization"
},
{
"id": "00b29040-921d-11e9-aa19-159bf182e06f",
"name": "5:panel_5",
Expand All @@ -791,6 +783,11 @@
"name": "6:panel_6",
"type": "visualization"
},
{
"id": "be8d8d30-09ae-11ec-8d29-f3a1bb757c14",
"name": "4abe34b0-e220-4d15-8da1-e32da039bd49:panel_4abe34b0-e220-4d15-8da1-e32da039bd49",
"type": "lens"
},
{
"id": "68f36fb0-f0a0-11eb-b61f-a53cb4913361",
"name": "4d89e43f-299c-4f43-bde2-0ada0983ff23:panel_4d89e43f-299c-4f43-bde2-0ada0983ff23",
Expand Down Expand Up @@ -878,6 +875,6 @@
}
],
"type": "dashboard",
"updated_at": "2021-08-04T16:30:34.757Z",
"version": "WzM0MTAsMV0="
"updated_at": "2021-08-30T19:07:33.984Z",
"version": "WzEyMzQyLDJd"
}
8 changes: 4 additions & 4 deletions x-pack/metricbeat/module/aws/_meta/kibana/7/lens/30fd4e40-f0a1-11eb-b61f-a53cb4913361.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,10 @@
"title": "RDS Write IOPS [Metricbeat AWS]",
"visualizationType": "lnsXY"
},
"coreMigrationVersion": "8.0.0",
"coreMigrationVersion": "7.14.0",
"id": "30fd4e40-f0a1-11eb-b61f-a53cb4913361",
"migrationVersion": {
"lens": "7.13.1"
"lens": "7.14.0"
},
"references": [
{
Expand All @@ -142,6 +142,6 @@
}
],
"type": "lens",
"updated_at": "2021-08-04T16:30:34.757Z",
"version": "WzM0MjEsMV0="
"updated_at": "2021-08-04T21:05:50.194Z",
"version": "WzU1MTksMl0="
}
16 changes: 8 additions & 8 deletions x-pack/metricbeat/module/aws/_meta/kibana/7/lens/41e37710-f09d-11eb-b61f-a53cb4913361.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
"customLabel": true,
"dataType": "number",
"isBucketed": false,
"label": "Select Throughput Count/Second",
"label": "Write Throughput MB/Second",
"operationType": "formula",
"params": {
"formula": "average(aws.rds.throughput.select)",
"formula": "average(aws.rds.throughput.write)",
"isFormulaBroken": false
},
"references": [
Expand All @@ -35,7 +35,7 @@
"label": "Part of Select Throughput Count/Second",
"operationType": "average",
"scale": "ratio",
"sourceField": "aws.rds.throughput.select"
"sourceField": "aws.rds.throughput.write"
},
"bc08fa3e-ce15-4acd-a0fd-c5c5c5452441": {
"dataType": "string",
Expand Down Expand Up @@ -121,13 +121,13 @@
}
}
},
"title": "RDS Select Throughput[Metricbeat AWS]",
"title": "RDS Write Throughput[Metricbeat AWS]",
"visualizationType": "lnsXY"
},
"coreMigrationVersion": "8.0.0",
"coreMigrationVersion": "7.14.0",
"id": "41e37710-f09d-11eb-b61f-a53cb4913361",
"migrationVersion": {
"lens": "7.13.1"
"lens": "7.14.0"
},
"references": [
{
Expand All @@ -142,6 +142,6 @@
}
],
"type": "lens",
"updated_at": "2021-08-04T16:30:34.757Z",
"version": "WzM0MTgsMV0="
"updated_at": "2021-08-25T14:42:42.329Z",
"version": "Wzc1NDMsMl0="
}
8 changes: 4 additions & 4 deletions x-pack/metricbeat/module/aws/_meta/kibana/7/lens/68f36fb0-f0a0-11eb-b61f-a53cb4913361.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,10 @@
"title": "RDS Free Storage Bytes [Metricbeat AWS]",
"visualizationType": "lnsDatatable"
},
"coreMigrationVersion": "8.0.0",
"coreMigrationVersion": "7.14.0",
"id": "68f36fb0-f0a0-11eb-b61f-a53cb4913361",
"migrationVersion": {
"lens": "7.13.1"
"lens": "7.14.0"
},
"references": [
{
Expand All @@ -100,6 +100,6 @@
}
],
"type": "lens",
"updated_at": "2021-08-04T16:30:34.757Z",
"version": "WzM0MTQsMV0="
"updated_at": "2021-08-04T21:05:50.194Z",
"version": "WzU1MTIsMl0="
}
8 changes: 4 additions & 4 deletions x-pack/metricbeat/module/aws/_meta/kibana/7/lens/8560b400-f096-11eb-b61f-a53cb4913361.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,10 @@
"title": "RDS Write Latency in Milliseconds [Metricbeat AWS]",
"visualizationType": "lnsXY"
},
"coreMigrationVersion": "8.0.0",
"coreMigrationVersion": "7.14.0",
"id": "8560b400-f096-11eb-b61f-a53cb4913361",
"migrationVersion": {
"lens": "7.13.1"
"lens": "7.14.0"
},
"references": [
{
Expand All @@ -142,6 +142,6 @@
}
],
"type": "lens",
"updated_at": "2021-08-04T16:30:34.757Z",
"version": "WzM0MTYsMV0="
"updated_at": "2021-08-04T21:05:50.194Z",
"version": "WzU1MTQsMl0="
}
16 changes: 8 additions & 8 deletions x-pack/metricbeat/module/aws/_meta/kibana/7/lens/b0077d10-f09b-11eb-b61f-a53cb4913361.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"attributes": {
"description": null,
"description": "",
"state": {
"datasourceStates": {
"indexpattern": {
Expand Down Expand Up @@ -34,10 +34,10 @@
"customLabel": true,
"dataType": "number",
"isBucketed": false,
"label": "Insert Throughput Count/Second",
"label": "Read Throughput MB/Second",
"operationType": "average",
"scale": "ratio",
"sourceField": "aws.rds.throughput.insert"
"sourceField": "aws.rds.throughput.read"
},
"e676afd3-ebd5-434a-85d7-a1a708b9a32f": {
"dataType": "date",
Expand Down Expand Up @@ -105,13 +105,13 @@
}
}
},
"title": "RDS Insert Throughput [Metricbeat AWS]",
"title": "RDS Read Throughput [Metricbeat AWS]",
"visualizationType": "lnsXY"
},
"coreMigrationVersion": "8.0.0",
"coreMigrationVersion": "7.14.0",
"id": "b0077d10-f09b-11eb-b61f-a53cb4913361",
"migrationVersion": {
"lens": "7.13.1"
"lens": "7.14.0"
},
"references": [
{
Expand All @@ -126,6 +126,6 @@
}
],
"type": "lens",
"updated_at": "2021-08-04T16:30:34.757Z",
"version": "WzM0MTcsMV0="
"updated_at": "2021-08-25T14:41:59.837Z",
"version": "Wzc1MjQsMl0="
}
Loading

0 comments on commit 54909cc

Please sign in to comment.