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.
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
script to add dashboards and other Kibana UI objects #518
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
elasticsearch/index_patterns/com.redhat.viaq-openshift.index-pattern.json
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| [ | ||
| { | ||
| "_id": "Kubernetes-Overview", | ||
| "_type": "dashboard", | ||
| "_source": { | ||
| "title": "Kubernetes Overview", | ||
| "hits": 0, | ||
| "description": "", | ||
| "panelsJSON": "[{\"id\":\"Kubernetes-Logs-by-Namespace,-DC,-Pod,-Container\",\"type\":\"visualization\",\"panelIndex\":1,\"size_x\":4,\"size_y\":4,\"col\":1,\"row\":1},{\"id\":\"Kubernetes-Logs-over-Time-w-slash-Container-Name\",\"type\":\"visualization\",\"panelIndex\":2,\"size_x\":8,\"size_y\":4,\"col\":5,\"row\":1},{\"id\":\"k8s-logs\",\"type\":\"search\",\"panelIndex\":3,\"size_x\":12,\"size_y\":18,\"col\":1,\"row\":5,\"columns\":[\"kubernetes.namespace_name\",\"kubernetes.labels.deploymentconfig\",\"kubernetes.pod_name\",\"kubernetes.container_name\",\"message\"],\"sort\":[\"@timestamp\",\"desc\"]}]", | ||
| "optionsJSON": "{\"darkTheme\":false}", | ||
| "uiStateJSON": "{}", | ||
| "version": 1, | ||
| "timeRestore": true, | ||
| "timeTo": "now", | ||
| "timeFrom": "now-1h/h", | ||
| "kibanaSavedObjectMeta": { | ||
| "searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}}}]}" | ||
| } | ||
| } | ||
| } | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| [ | ||
| { | ||
| "_id": "k8s-logs", | ||
| "_type": "search", | ||
| "_source": { | ||
| "title": "k8s-logs", | ||
| "description": "", | ||
| "hits": 0, | ||
| "columns": [ | ||
| "kubernetes.namespace_name", | ||
| "kubernetes.labels.deploymentconfig", | ||
| "kubernetes.pod_name", | ||
| "kubernetes.container_name", | ||
| "message" | ||
| ], | ||
| "sort": [ | ||
| "@timestamp", | ||
| "desc" | ||
| ], | ||
| "version": 1, | ||
| "kibanaSavedObjectMeta": { | ||
| "searchSourceJSON": "{\"index\":\"project.*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[],\"highlight\":{\"pre_tags\":[\"@kibana-highlighted-field@\"],\"post_tags\":[\"@/kibana-highlighted-field@\"],\"fields\":{\"*\":{}},\"require_field_match\":false,\"fragment_size\":2147483647}}" | ||
| } | ||
| } | ||
| } | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| [ | ||
| { | ||
| "_id": "Kubernetes-Logs-by-Namespace,-DC,-Pod,-Container", | ||
| "_type": "visualization", | ||
| "_source": { | ||
| "title": "Kubernetes Logs by Namespace, DC, Pod, Container", | ||
| "visState": "{\"title\":\"New Visualization\",\"type\":\"pie\",\"params\":{\"shareYAxis\":true,\"addTooltip\":true,\"addLegend\":true,\"isDonut\":false},\"aggs\":[{\"id\":\"1\",\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"kubernetes.namespace_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\"}},{\"id\":\"3\",\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"kubernetes.labels.deploymentconfig.raw\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\"}},{\"id\":\"4\",\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"kubernetes.pod_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\"}},{\"id\":\"5\",\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"kubernetes.container_name.raw\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}", | ||
| "uiStateJSON": "{}", | ||
| "description": "", | ||
| "savedSearchId": "k8s-logs", | ||
| "version": 1, | ||
| "kibanaSavedObjectMeta": { | ||
| "searchSourceJSON": "{\"filter\":[]}" | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "_id": "Kubernetes-Logs-over-Time-w-slash-Container-Name", | ||
| "_type": "visualization", | ||
| "_source": { | ||
| "title": "Kubernetes Logs over Time w/ Container Name", | ||
| "visState": "{\"title\":\"New Visualization\",\"type\":\"histogram\",\"params\":{\"shareYAxis\":true,\"addTooltip\":true,\"addLegend\":true,\"scale\":\"linear\",\"mode\":\"stacked\",\"times\":[],\"addTimeMarker\":false,\"defaultYExtents\":false,\"setYExtents\":false,\"yAxis\":{}},\"aggs\":[{\"id\":\"1\",\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"@timestamp\",\"interval\":\"auto\",\"customInterval\":\"2h\",\"min_doc_count\":1,\"extended_bounds\":{}}},{\"id\":\"3\",\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"kubernetes.container_name.raw\",\"size\":25,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}", | ||
| "uiStateJSON": "{}", | ||
| "description": "", | ||
| "savedSearchId": "k8s-logs", | ||
| "version": 1, | ||
| "kibanaSavedObjectMeta": { | ||
| "searchSourceJSON": "{\"filter\":[]}" | ||
| } | ||
| } | ||
| } | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| #!/bin/bash -e | ||
|
|
||
| source "logging" | ||
|
|
||
| set -euo pipefail | ||
|
|
||
| if [ -n "${DEBUG:-}" -o $loglevelint = 7 ] ; then | ||
| set -x | ||
| curl_output() { | ||
| python -mjson.tool | ||
| } | ||
| else | ||
| curl_output() { | ||
| cat > /dev/null 2>&1 | ||
| } | ||
| fi | ||
|
|
||
| usage() { | ||
| error Usage: $0 user-name | ||
| error The kibana index for the given user must already exist | ||
| } | ||
|
|
||
| if [ -z "${1:-}" ] ; then | ||
| usage | ||
| exit 1 | ||
| fi | ||
|
|
||
| kibindex=$( get_kibana_index_name "$1" ) | ||
|
|
||
| resp_code=$( QUERY="/$kibindex" es_util -XHEAD -w '%{response_code}' ) | ||
|
|
||
| if [ "$resp_code" != 200 ] ; then | ||
| error Could not find kibana index $kibindex for user $1: $resp_code | ||
| exit 1 | ||
| fi | ||
|
|
||
| info Adding Kibana dashboards and other UI objects for user $1 index $kibindex | ||
|
|
||
| INDEX_PATTERN=${INDEX_PATTERN:-project.*} | ||
| INDEX_PATTERN_FILE=${INDEX_PATTERN_FILE:-/usr/share/elasticsearch/index_patterns/com.redhat.viaq-openshift.index-pattern.json} | ||
| INDEX_PATTERN_TYPE=${INDEX_PATTERN_TYPE:-index-pattern} | ||
| KIBANA_UI_OBJECTS_DIR=${KIBANA_UI_OBJECTS_DIR:-/usr/share/elasticsearch/kibana_ui_objects} | ||
|
|
||
| info Adding the index pattern for "$INDEX_PATTERN" . . . | ||
|
|
||
| cat $INDEX_PATTERN_FILE | \ | ||
| sed "s/[$]TITLE[$]/$INDEX_PATTERN/g" | \ | ||
| QUERY="/$kibindex/$INDEX_PATTERN_TYPE/$INDEX_PATTERN" es_util -XPUT --data-binary @- | curl_output | ||
|
|
||
| info Adding the Kibana UI objects . . . | ||
| { | ||
| for file in $KIBANA_UI_OBJECTS_DIR/*.json ; do | ||
| cat "$file" | python -c ' | ||
| import sys | ||
| import json | ||
| obj = json.load(sys.stdin) | ||
| for doc in obj: | ||
| hdr = {"create":{"_type":doc["_type"],"_id":doc["_id"]}} | ||
| json.dump(hdr, sys.stdout) | ||
| sys.stdout.write("\n") | ||
| json.dump(doc["_source"], sys.stdout) | ||
| sys.stdout.write("\n") | ||
| ' | ||
| done | ||
| } | QUERY="/$kibindex/_bulk" es_util -XPOST --data-binary @- | curl_output | ||
|
|
||
| info Success | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| #!/bin/bash | ||
|
|
||
| source "$(dirname "${BASH_SOURCE[0]}" )/../lib/init.sh" | ||
|
|
||
| exec ${OS_O_A_L_DIR}/test/kibana_dashboards.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should consider refactoring '/usr/share/elasticsearch/' into a var like ES_HOME. If I ever get the reconciliation PR complete I think this will simply the impact and additional modifications we need to make.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok - but there are likely other places which will need to change