Skip to content

Enable asset tests #536

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

Merged
mtojek merged 9 commits into from
Jan 18, 2021
Merged

Enable asset tests #536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f032dda
Update dependency on elastic-package
Jan 18, 2021
da19155
Always run elastic-package test
Jan 18, 2021
5e80ab9
Revert "Apache: convert bytes_per_sec visualization to lens (#530)"
Jan 18, 2021
12c8df3
apache: fix version
Jan 18, 2021
858ecb1
mongodb: fix mongodb-search
Jan 18, 2021
243e158
system: fix kibana prefixes
Jan 18, 2021
5e28338
Revert "system: fix kibana prefixes"
Jan 18, 2021
d6d885b
Revert "mongodb: fix mongodb-search"
Jan 18, 2021
ad446b8
Bump up elastic-package again
Jan 18, 2021
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
16 changes: 5 additions & 11 deletions .ci/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,11 @@ pipeline {
try {
dir("${BASE_DIR}/packages/${it}") {
sh(label: "Check integration: ${it}", script: '../../build/elastic-package check -v')
// Check if there are test folders present, so the CI job runner can spawn the Elastic stack
// locally and run tests for the integration. The condition prevents from spawning the stack
// unnecessarily (while no tests are defined).
def r = sh(label: "Find test folders", script: 'find . -d -name test | grep .', returnStatus: true)
if (r == 0) {
sh(label: "Boot up the Elastic stack", script: '../../build/elastic-package stack up -d -v')
sh(label: "Test integration: ${it}", script: '''
eval "$(../../build/elastic-package stack shellinit)"
../../build/elastic-package test -v --report-format xUnit --report-output file
''')
}
sh(label: "Boot up the Elastic stack", script: '../../build/elastic-package stack up -d -v')
sh(label: "Test integration: ${it}", script: '''
eval "$(../../build/elastic-package stack shellinit)"
../../build/elastic-package test -v --report-format xUnit --report-output file
''')
}
} finally {
dir("${BASE_DIR}") {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.12

require (
github.com/blang/semver v3.5.1+incompatible
github.com/elastic/elastic-package v0.0.0-20210114174512-e4b08c480f1f
github.com/elastic/elastic-package v0.0.0-20210118134226-ec5c00a8ad4d
github.com/elastic/package-registry v0.13.0
github.com/magefile/mage v1.10.0
github.com/pkg/errors v0.9.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
github.com/elastic/elastic-package v0.0.0-20210114174512-e4b08c480f1f h1:nSZjPaTsPTUoOCM2aGxgTLrZb0mf56gxuWAlECI/cRk=
github.com/elastic/elastic-package v0.0.0-20210114174512-e4b08c480f1f/go.mod h1:lphRg8ZgCi63Nd3vpKy29oqx2N/mme2VdTSHpN1ZNnk=
github.com/elastic/elastic-package v0.0.0-20210118134226-ec5c00a8ad4d h1:KYFFjqV2c2Yz1XL1815XyB4omlDd2597ua/usgqCVcI=
github.com/elastic/elastic-package v0.0.0-20210118134226-ec5c00a8ad4d/go.mod h1:lphRg8ZgCi63Nd3vpKy29oqx2N/mme2VdTSHpN1ZNnk=
github.com/elastic/go-elasticsearch/v7 v7.9.0 h1:UEau+a1MiiE/F+UrDj60kqIHFWdzU1M2y/YtBU2NC2M=
github.com/elastic/go-elasticsearch/v7 v7.9.0/go.mod h1:OJ4wdbtDNk5g503kvlHLyErCgQwwzmDtaFC4XyOxXA4=
github.com/elastic/go-ucfg v0.8.3/go.mod h1:iaiY0NBIYeasNgycLyTvhJftQlQEUO2hpF+FX0JKxzo=
Expand Down
229 changes: 229 additions & 0 deletions packages/apache/kibana/dashboard/apache-Logs-Apache-Dashboard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,229 @@
{
"attributes": {
"description": "Logs Apache integration dashboard",
"hits": 0,
"kibanaSavedObjectMeta": {
"searchSourceJSON": {
"filter": [],
"highlightAll": true,
"query": {
"language": "kuery",
"query": ""
},
"version": true
}
},
"optionsJSON": {
"darkTheme": false,
"useMargins": true
},
"panelsJSON": [
{
"embeddableConfig": {
"enhancements": {},
"mapBounds": {
"bottom_right": {
"lat": -3.864254615721396,
"lon": 205.3125
},
"top_left": {
"lat": 67.7427590666639,
"lon": -205.6640625
}
},
"mapCenter": [
40.713955826286046,
-0.17578125
],
"mapCollar": {
"bottom_right": {
"lat": -39.667755,
"lon": 180
},
"top_left": {
"lat": 90,
"lon": -180
},
"zoom": 2
},
"mapZoom": 2
},
"gridData": {
"h": 12,
"i": "1",
"w": 35,
"x": 13,
"y": 0
},
"panelIndex": "1",
"panelRefName": "panel_0",
"version": "7.9.3"
},
{
"embeddableConfig": {
"enhancements": {}
},
"gridData": {
"h": 12,
"i": "2",
"w": 32,
"x": 0,
"y": 20
},
"panelIndex": "2",
"panelRefName": "panel_1",
"version": "7.9.3"
},
{
"embeddableConfig": {
"enhancements": {}
},
"gridData": {
"h": 12,
"i": "3",
"w": 16,
"x": 32,
"y": 20
},
"panelIndex": "3",
"panelRefName": "panel_2",
"version": "7.9.3"
},
{
"embeddableConfig": {
"enhancements": {}
},
"gridData": {
"h": 8,
"i": "4",
"w": 8,
"x": 40,
"y": 12
},
"panelIndex": "4",
"panelRefName": "panel_3",
"version": "7.9.3"
},
{
"embeddableConfig": {
"enhancements": {}
},
"gridData": {
"h": 8,
"i": "5",
"w": 48,
"x": 0,
"y": 32
},
"panelIndex": "5",
"panelRefName": "panel_4",
"version": "7.9.3"
},
{
"embeddableConfig": {
"enhancements": {}
},
"gridData": {
"h": 8,
"i": "6",
"w": 40,
"x": 0,
"y": 12
},
"panelIndex": "6",
"panelRefName": "panel_5",
"version": "7.9.3"
},
{
"embeddableConfig": {
"columns": [
"source.address",
"log.level",
"apache2.error.integration",
"message"
],
"enhancements": {},
"sort": [
"@timestamp",
"desc"
]
},
"gridData": {
"h": 12,
"i": "7",
"w": 48,
"x": 0,
"y": 40
},
"panelIndex": "7",
"panelRefName": "panel_6",
"version": "7.9.3"
},
{
"embeddableConfig": {
"enhancements": {}
},
"gridData": {
"h": 5,
"i": "f5d1286d-411a-4759-a2e2-0b3227b93cfa",
"w": 13,
"x": 0,
"y": 0
},
"panelIndex": "f5d1286d-411a-4759-a2e2-0b3227b93cfa",
"panelRefName": "panel_7",
"version": "7.9.3"
}
],
"timeRestore": false,
"title": "[Logs Apache] Access and error logs",
"version": 1
},
"id": "apache-Logs-Apache-Dashboard",
"migrationVersion": {
"dashboard": "7.11.0"
},
"references": [
{
"id": "apache-access-unique-IPs-map",
"name": "panel_0",
"type": "visualization"
},
{
"id": "apache-response-codes-of-top-URLs",
"name": "panel_1",
"type": "visualization"
},
{
"id": "apache-browsers",
"name": "panel_2",
"type": "visualization"
},
{
"id": "apache-operating-systems",
"name": "panel_3",
"type": "visualization"
},
{
"id": "apache-error-logs-over-time",
"name": "panel_4",
"type": "visualization"
},
{
"id": "apache-response-codes-over-time",
"name": "panel_5",
"type": "visualization"
},
{
"id": "apache-errors-log",
"name": "panel_6",
"type": "search"
},
{
"id": "apache-ed44f820-3a10-11eb-8946-296aab7b13db",
"name": "panel_7",
"type": "visualization"
}
],
"type": "dashboard"
}
Loading