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.

Sign up for GitHub

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

Jump to bottom

[7.x] Add new hostname information on Intake API and in ES. (#2540) #2624

Merged
merged 1 commit into from
Aug 23, 2019
Merged

[7.x] Add new hostname information on Intake API and in ES. (#2540) #2624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions beater/api/config_agent_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"github.com/elastic/apm-server/beater/config"
"github.com/elastic/apm-server/beater/headers"
"github.com/elastic/apm-server/beater/request"
"github.com/elastic/apm-server/tests"
"github.com/elastic/apm-server/tests/approvals"
)

func TestConfigAgentHandler_AuthorizationMiddleware(t *testing.T) {
Expand All @@ -42,7 +42,7 @@ func TestConfigAgentHandler_AuthorizationMiddleware(t *testing.T) {
rec := requestToConfigAgentHandler(t, cfg)

assert.Equal(t, http.StatusUnauthorized, rec.Code)
tests.AssertApproveResult(t, approvalPathConfigAgent(t.Name()), rec.Body.Bytes())
approvals.AssertApproveResult(t, approvalPathConfigAgent(t.Name()), rec.Body.Bytes())
})

t.Run("Authorized", func(t *testing.T) {
Expand All @@ -55,7 +55,7 @@ func TestConfigAgentHandler_AuthorizationMiddleware(t *testing.T) {
h(c)

assert.Equal(t, http.StatusServiceUnavailable, rec.Code)
tests.AssertApproveResult(t, approvalPathConfigAgent(t.Name()), rec.Body.Bytes())
approvals.AssertApproveResult(t, approvalPathConfigAgent(t.Name()), rec.Body.Bytes())
})
}

Expand All @@ -64,15 +64,15 @@ func TestConfigAgentHandler_KillSwitchMiddleware(t *testing.T) {
rec := requestToConfigAgentHandler(t, config.DefaultConfig(beatertest.MockBeatVersion()))

assert.Equal(t, http.StatusForbidden, rec.Code)
tests.AssertApproveResult(t, approvalPathConfigAgent(t.Name()), rec.Body.Bytes())
approvals.AssertApproveResult(t, approvalPathConfigAgent(t.Name()), rec.Body.Bytes())

})

t.Run("On", func(t *testing.T) {
rec := requestToConfigAgentHandler(t, configEnabledConfigAgent())

assert.Equal(t, http.StatusServiceUnavailable, rec.Code)
tests.AssertApproveResult(t, approvalPathConfigAgent(t.Name()), rec.Body.Bytes())
approvals.AssertApproveResult(t, approvalPathConfigAgent(t.Name()), rec.Body.Bytes())
})
}

Expand All @@ -84,7 +84,7 @@ func TestConfigAgentHandler_PanicMiddleware(t *testing.T) {
c.Reset(rec, httptest.NewRequest(http.MethodGet, "/", nil))
h(c)
assert.Equal(t, http.StatusInternalServerError, rec.StatusCode)
tests.AssertApproveResult(t, approvalPathConfigAgent(t.Name()), rec.Body.Bytes())
approvals.AssertApproveResult(t, approvalPathConfigAgent(t.Name()), rec.Body.Bytes())
}

func TestConfigAgentHandler_MonitoringMiddleware(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions beater/api/intake/handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (
"github.com/elastic/apm-server/model"
"github.com/elastic/apm-server/processor/stream"
"github.com/elastic/apm-server/publish"
"github.com/elastic/apm-server/tests"
"github.com/elastic/apm-server/tests/approvals"
"github.com/elastic/apm-server/tests/loader"
"github.com/elastic/apm-server/transform"
)
Expand Down Expand Up @@ -154,7 +154,7 @@ func TestIntakeHandler(t *testing.T) {
assert.NotNil(t, tc.w.Body.Len())
}
body := tc.w.Body.Bytes()
tests.AssertApproveResult(t, "test_approved/"+name, body)
approvals.AssertApproveResult(t, "test_approved/"+name, body)
})
}
}
Expand Down
8 changes: 4 additions & 4 deletions beater/api/intake_backend_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/elastic/apm-server/beater/config"
"github.com/elastic/apm-server/beater/headers"
"github.com/elastic/apm-server/beater/request"
"github.com/elastic/apm-server/tests"
"github.com/elastic/apm-server/tests/approvals"
)

func TestIntakeBackendHandler_AuthorizationMiddleware(t *testing.T) {
Expand All @@ -40,7 +40,7 @@ func TestIntakeBackendHandler_AuthorizationMiddleware(t *testing.T) {
rec := requestToIntakeBackendHandler(t, cfg)

assert.Equal(t, http.StatusUnauthorized, rec.Code)
tests.AssertApproveResult(t, approvalPathIntakeBackend(t.Name()), rec.Body.Bytes())
approvals.AssertApproveResult(t, approvalPathIntakeBackend(t.Name()), rec.Body.Bytes())
})

t.Run("Authorized", func(t *testing.T) {
Expand All @@ -53,7 +53,7 @@ func TestIntakeBackendHandler_AuthorizationMiddleware(t *testing.T) {
h(c)

assert.Equal(t, http.StatusBadRequest, rec.Code)
tests.AssertApproveResult(t, approvalPathIntakeBackend(t.Name()), rec.Body.Bytes())
approvals.AssertApproveResult(t, approvalPathIntakeBackend(t.Name()), rec.Body.Bytes())
})
}

Expand All @@ -65,7 +65,7 @@ func TestIntakeBackendHandler_PanicMiddleware(t *testing.T) {
c.Reset(rec, httptest.NewRequest(http.MethodGet, "/", nil))
h(c)
assert.Equal(t, http.StatusInternalServerError, rec.StatusCode)
tests.AssertApproveResult(t, approvalPathIntakeBackend(t.Name()), rec.Body.Bytes())
approvals.AssertApproveResult(t, approvalPathIntakeBackend(t.Name()), rec.Body.Bytes())
}

func TestIntakeBackendHandler_MonitoringMiddleware(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions beater/api/intake_rum_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"github.com/elastic/apm-server/beater/headers"
"github.com/elastic/apm-server/beater/middleware"
"github.com/elastic/apm-server/beater/request"
"github.com/elastic/apm-server/tests"
"github.com/elastic/apm-server/tests/approvals"
)

func TestOPTIONS(t *testing.T) {
Expand Down Expand Up @@ -73,14 +73,14 @@ func TestRUMHandler_KillSwitchMiddleware(t *testing.T) {
rec := requestToIntakeRUMHandler(t, config.DefaultConfig(beatertest.MockBeatVersion()))

assert.Equal(t, http.StatusForbidden, rec.Code)
tests.AssertApproveResult(t, approvalPathIntakeRUM(t.Name()), rec.Body.Bytes())
approvals.AssertApproveResult(t, approvalPathIntakeRUM(t.Name()), rec.Body.Bytes())
})

t.Run("On", func(t *testing.T) {
rec := requestToIntakeRUMHandler(t, cfgEnabledRUM())

assert.Equal(t, http.StatusBadRequest, rec.Code)
tests.AssertApproveResult(t, approvalPathIntakeRUM(t.Name()), rec.Body.Bytes())
approvals.AssertApproveResult(t, approvalPathIntakeRUM(t.Name()), rec.Body.Bytes())
})
}

Expand All @@ -104,7 +104,7 @@ func TestIntakeRUMHandler_PanicMiddleware(t *testing.T) {
c.Reset(rec, httptest.NewRequest(http.MethodGet, "/", nil))
h(c)
assert.Equal(t, http.StatusInternalServerError, rec.StatusCode)
tests.AssertApproveResult(t, approvalPathIntakeRUM(t.Name()), rec.Body.Bytes())
approvals.AssertApproveResult(t, approvalPathIntakeRUM(t.Name()), rec.Body.Bytes())
}

func TestRumHandler_MonitoringMiddleware(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions beater/api/root_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/elastic/apm-server/beater/config"
"github.com/elastic/apm-server/beater/headers"
"github.com/elastic/apm-server/beater/request"
"github.com/elastic/apm-server/tests"
"github.com/elastic/apm-server/tests/approvals"
)

func TestRootHandler_AuthorizationMiddleware(t *testing.T) {
Expand All @@ -53,7 +53,7 @@ func TestRootHandler_AuthorizationMiddleware(t *testing.T) {
h(c)

assert.Equal(t, http.StatusOK, rec.Code)
tests.AssertApproveResult(t, approvalPathRoot(t.Name()), rec.Body.Bytes())
approvals.AssertApproveResult(t, approvalPathRoot(t.Name()), rec.Body.Bytes())
})
}

Expand All @@ -66,7 +66,7 @@ func TestRootHandler_PanicMiddleware(t *testing.T) {
h(c)

assert.Equal(t, http.StatusInternalServerError, rec.StatusCode)
tests.AssertApproveResult(t, approvalPathRoot(t.Name()), rec.Body.Bytes())
approvals.AssertApproveResult(t, approvalPathRoot(t.Name()), rec.Body.Bytes())
}

func TestRootHandler_MonitoringMiddleware(t *testing.T) {
Expand Down
14 changes: 7 additions & 7 deletions beater/api/sourcemap_handler_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/elastic/apm-server/beater/config"
"github.com/elastic/apm-server/beater/headers"
"github.com/elastic/apm-server/beater/request"
"github.com/elastic/apm-server/tests"
"github.com/elastic/apm-server/tests/approvals"
)

func TestSourcemapHandler_AuthorizationMiddleware(t *testing.T) {
Expand All @@ -40,7 +40,7 @@ func TestSourcemapHandler_AuthorizationMiddleware(t *testing.T) {
rec := requestToSourcemapHandler(t, cfg)

assert.Equal(t, http.StatusUnauthorized, rec.Code)
tests.AssertApproveResult(t, approvalPathAsset(t.Name()), rec.Body.Bytes())
approvals.AssertApproveResult(t, approvalPathAsset(t.Name()), rec.Body.Bytes())
})

t.Run("Authorized", func(t *testing.T) {
Expand All @@ -53,7 +53,7 @@ func TestSourcemapHandler_AuthorizationMiddleware(t *testing.T) {
h(c)

assert.Equal(t, http.StatusBadRequest, rec.Code)
tests.AssertApproveResult(t, approvalPathAsset(t.Name()), rec.Body.Bytes())
approvals.AssertApproveResult(t, approvalPathAsset(t.Name()), rec.Body.Bytes())
})
}

Expand All @@ -62,7 +62,7 @@ func TestSourcemapHandler_KillSwitchMiddleware(t *testing.T) {
rec := requestToSourcemapHandler(t, config.DefaultConfig(beatertest.MockBeatVersion()))

assert.Equal(t, http.StatusForbidden, rec.Code)
tests.AssertApproveResult(t, approvalPathAsset(t.Name()), rec.Body.Bytes())
approvals.AssertApproveResult(t, approvalPathAsset(t.Name()), rec.Body.Bytes())
})

t.Run("OffSourcemap", func(t *testing.T) {
Expand All @@ -73,14 +73,14 @@ func TestSourcemapHandler_KillSwitchMiddleware(t *testing.T) {
rec := requestToSourcemapHandler(t, cfg)

assert.Equal(t, http.StatusForbidden, rec.Code)
tests.AssertApproveResult(t, approvalPathAsset(t.Name()), rec.Body.Bytes())
approvals.AssertApproveResult(t, approvalPathAsset(t.Name()), rec.Body.Bytes())
})

t.Run("On", func(t *testing.T) {
rec := requestToSourcemapHandler(t, cfgEnabledRUM())

assert.Equal(t, http.StatusBadRequest, rec.Code)
tests.AssertApproveResult(t, approvalPathAsset(t.Name()), rec.Body.Bytes())
approvals.AssertApproveResult(t, approvalPathAsset(t.Name()), rec.Body.Bytes())
})
}

Expand All @@ -92,7 +92,7 @@ func TestSourcemapHandler_PanicMiddleware(t *testing.T) {
c.Reset(rec, httptest.NewRequest(http.MethodGet, "/", nil))
h(c)
assert.Equal(t, http.StatusInternalServerError, rec.StatusCode)
tests.AssertApproveResult(t, approvalPathAsset(t.Name()), rec.Body.Bytes())
approvals.AssertApproveResult(t, approvalPathAsset(t.Name()), rec.Body.Bytes())
}

func TestSourcemapHandler_MonitoringMiddleware(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions beater/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/stretchr/testify/require"

"github.com/elastic/apm-server/beater/api"
"github.com/elastic/apm-server/tests"
"github.com/elastic/apm-server/tests/approvals"
"github.com/elastic/apm-server/tests/loader"
"github.com/elastic/beats/libbeat/beat"
"github.com/elastic/beats/libbeat/common"
Expand Down Expand Up @@ -124,7 +124,7 @@ func TestPublishIntegration(t *testing.T) {
b, err := loader.LoadDataAsBytes(filepath.Join("../testdata/intake-v2/", tc.payload))
require.NoError(t, err)
docs := testPublish(t, apm, events, api.IntakePath, bytes.NewReader(b))
tests.AssertApproveResult(t, "test_approved_es_documents/TestPublishIntegration"+tc.name, docs)
approvals.AssertApproveResult(t, "test_approved_es_documents/TestPublishIntegration"+tc.name, docs)
})
}
}
Expand Down
11 changes: 8 additions & 3 deletions docs/spec/system.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,17 @@
"maxLength": 1024
},
"hostname": {
"description": "Hostname of the system the agent is running on. Will be ignored if kubernetes information is set.",
"description": "Deprecated. Hostname of the system the agent is running on. Will be ignored if kubernetes information is set.",
"type": ["string", "null"],
"maxLength": 1024
},
"name": {
"description": "Name of the system the agent is running on. Will be set to hostname or derived from kubernetes information if not provided.",
"detected_hostname": {
"description": "Hostname of the host the monitored service is running on. It normally contains what the hostname command returns on the host machine. Will be ignored if kubernetes information is set, otherwise should always be set.",
"type": ["string", "null"],
"maxLength": 1024
},
"configured_hostname": {
"description": "Name of the host the monitored service is running on. It should only be set when configured by the user. If empty, will be set to detected_hostname or derived from kubernetes information if provided.",
"type": ["string", "null"],
"maxLength": 1024
},
Expand Down
4 changes: 2 additions & 2 deletions model/context_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (

"github.com/elastic/beats/libbeat/common"

"github.com/elastic/apm-server/tests"
"github.com/elastic/apm-server/tests/approvals"
"github.com/elastic/apm-server/utility"
)

Expand Down Expand Up @@ -168,7 +168,7 @@ func TestDecodeContext(t *testing.T) {
resultName := fmt.Sprintf("test_approved_model/context_%s", name)
resultJSON, err := json.Marshal(out)
require.NoError(t, err)
tests.AssertApproveResult(t, resultName, resultJSON)
approvals.AssertApproveResult(t, resultName, resultJSON)
}
})
}
Expand Down
11 changes: 8 additions & 3 deletions model/metadata/generated/schema/metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,17 @@ const ModelSchema = `{
"maxLength": 1024
},
"hostname": {
"description": "Hostname of the system the agent is running on. Will be ignored if kubernetes information is set.",
"description": "Deprecated. Hostname of the system the agent is running on. Will be ignored if kubernetes information is set.",
"type": ["string", "null"],
"maxLength": 1024
},
"name": {
"description": "Name of the system the agent is running on. Will be set to hostname or derived from kubernetes information if not provided.",
"detected_hostname": {
"description": "Hostname of the host the monitored service is running on. It normally contains what the hostname command returns on the host machine. Will be ignored if kubernetes information is set, otherwise should always be set.",
"type": ["string", "null"],
"maxLength": 1024
},
"configured_hostname": {
"description": "Name of the host the monitored service is running on. It should only be set when configured by the user. If empty, will be set to detected_hostname or derived from kubernetes information if provided.",
"type": ["string", "null"],
"maxLength": 1024
},
Expand Down
8 changes: 4 additions & 4 deletions model/metadata/metadata_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func TestDecodeMetadata(t *testing.T) {
Version: &agentVersion,
},
},
&System{Hostname: &host},
&System{DetectedHostname: &host},
&Process{Pid: pid},
&User{Id: &uid, Email: &mail},
common.MapStr{"k": "v", "n": 1, "f": 1.5, "b": false},
Expand Down Expand Up @@ -132,7 +132,7 @@ func TestMetadata_Set(t *testing.T) {
Version: &agentVersion,
},
},
&System{Hostname: &host},
&System{DetectedHostname: &host},
&Process{Pid: pid},
&User{Id: &uid, Email: &mail},
nil,
Expand Down Expand Up @@ -181,7 +181,7 @@ func TestMetadata_SetMinimal(t *testing.T) {
Version: &agentVersion,
},
},
&System{Hostname: &host},
&System{DetectedHostname: &host},
&Process{Pid: pid},
&User{Id: &uid, Email: &mail},
nil,
Expand All @@ -203,7 +203,7 @@ func TestMetadata_SetMinimal(t *testing.T) {
Version: &agentVersion,
},
},
&System{Hostname: &host},
&System{DetectedHostname: &host},
&Process{Pid: pid},
&User{Id: &uid},
common.MapStr{},
Expand Down
Loading