Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

BDS ELK 6.3.2 -> 6.8.0 Migration #719

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

BDS ELK 6.3.2 -> 6.8.0 Migration #719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2f45742
Fix for bug outlined in Issue #672. Implemented a variant of the sugg…
May 21, 2019
7402373
Previous commit was buggy, implementing suggested solution directly.
May 21, 2019
82e5bc3
Added a fix for Kibana 6.8.0 (dropped category), bumped plugin version..
Jun 11, 2019
f7239ea
Merge branch 'master' into bds-minor-fixes
Jun 11, 2019
1a43337
Bumping kibana plugin version to match.
Jun 11, 2019
d2e2890
Bumping requirements.
Jun 11, 2019
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
4 changes: 2 additions & 2 deletions csm_big_data/kibana/plugins/cast_vis/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cast_visualizer",
"version": "1.0.0",
"version": "1.0.1",
"description": "A kibana plugin to facilitate visualization and control of CAST datasets.",
"main": "index.js",
"kibana": {
Expand All @@ -11,7 +11,7 @@
"start": "plugin-helpers start",
"test:server": "plugin-helpers test:server",
"test:browser": "plugin-helpers test:browser",
"build": "plugin-helpers build -k 6.3.2",
"build": "plugin-helpers build -k 6.8.0",
"postinstall": "plugin-helpers postinstall"
},
"devDependencies": {
Expand Down
2 changes: 0 additions & 2 deletions csm_big_data/kibana/plugins/cast_vis/public/register_vis.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { CastVisController } from './vis_controller';

import CastSearchVisWrapper from './components/vis/cast_search_vis.js';

import { CATEGORY } from 'ui/vis/vis_category';
import { VisFactoryProvider } from 'ui/vis/vis_factory';
import { VisTypesRegistryProvider } from 'ui/registry/vis_types';
import { defaultFeedbackMessage } from 'ui/vis/default_feedback_message';
Expand All @@ -23,7 +22,6 @@ export default function CASTVisProvider(Private) {
isAccessible: true,
image,
description: 'Performs a CAST based filtering',
category: CATEGORY.OTHER,
feedbackMessage: defaultFeedbackMessage,
visualization: CastVisController,
visConfig: {
Expand Down
2 changes: 1 addition & 1 deletion csm_big_data/rpmscripts/kibana.post.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
echo "Adding Cast Visulizer to kibana plugins."

/usr/share/kibana/bin/kibana-plugin remove cast_visualizer
/usr/share/kibana/bin/kibana-plugin install file:///opt/ibm/csm/bigdata/kibana/cast_visualizer-1.0.0.zip
/usr/share/kibana/bin/kibana-plugin install file:///opt/ibm/csm/bigdata/kibana/cast_visualizer-1.0.1.zip

echo "Cast Visulizer added to kibana plugins."

4 changes: 2 additions & 2 deletions csm_big_data/setupRPM.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ set( CPACK_RPM_csm-bds-kibana_PRE_UNINSTALL_SCRIPT_FILE
"${CMAKE_CURRENT_SOURCE_DIR}/csm_big_data/rpmscripts/kibana.pre.uninstall")
set( CPACK_RPM_csm-bds-kibana_POST_INSTALL_SCRIPT_FILE
"${CMAKE_CURRENT_SOURCE_DIR}/csm_big_data/rpmscripts/kibana.post.install")
set(CPACK_RPM_csm-bds-kibana_PACKAGE_REQUIRES "kibana >= 6.2.3")
set(CPACK_RPM_csm-bds-kibana_PACKAGE_REQUIRES "kibana >= 6.8.0")


# Setup Logstash RPM
Expand All @@ -35,5 +35,5 @@ set( CPACK_RPM_csm-bds-logstash_PRE_UNINSTALL_SCRIPT_FILE
"${CMAKE_CURRENT_SOURCE_DIR}/csm_big_data/rpmscripts/logstash.pre.uninstall")
set( CPACK_RPM_csm-bds-logstash_POST_INSTALL_SCRIPT_FILE
"${CMAKE_CURRENT_SOURCE_DIR}/csm_big_data/rpmscripts/logstash.post.install")
set(CPACK_RPM_csm-bds-logstash_PACKAGE_REQUIRES "logstash >= 6.2.3")
set(CPACK_RPM_csm-bds-logstash_PACKAGE_REQUIRES "logstash >= 6.8.0")