KIALI-1906 Support for security and non security environments

package.json

@@ -71,7 +71,7 @@
     "js-yaml": "3.12.0",
     "json-beautify": "1.0.1",
     "lodash": "4.17.11",
-    "logfmt": "^1.2.1",
+    "logfmt": "1.2.1",
     "moment": "2.23.0",
     "patternfly": "3.59.1",
     "patternfly-react": "2.25.3",

src/actions/HelpDropdownThunkActions.ts

@@ -24,6 +24,10 @@ const HelpDropdownThunkActions = {
           const hasJaeger = status['data']['externalServices'].filter(item => item['name'] === 'Jaeger');
           if (hasJaeger.length === 1) {
             dispatch(JaegerActions.setUrl(hasJaeger[0]['url']));
+            // If same protocol enable integration
+            if (hasJaeger[0]['url'].startsWith(window.location.protocol)) {
+              dispatch(JaegerActions.setEnableIntegration(true));
+            }
           }
 
           status['data']['warningMessages'].forEach(wMsg => {

src/actions/JaegerActions.ts

@@ -14,6 +14,8 @@ enum JaegerActionKeys {
   SET_LIMIT = 'SET_LIMIT',
   SET_DURATIONS = 'SET_DURATIONS',
 
+  // ENABLE INTEGRAION WITH JAEGER
+  SET_ENABLE_INTEGRATION = 'SET_ENABLE_INTEGRATION',
   // RESULTS VISUALZIATION OPTIONS
   SET_SEARCH_GRAPH_TO_HIDE = 'SET_SEARCH_GRAPH_TO_HIDE',
 
@@ -36,9 +38,10 @@ export const JaegerActions = {
       list: newList
     })
   ),
+  setEnableIntegration: createStandardAction(JaegerActionKeys.SET_ENABLE_INTEGRATION)<boolean>(),
   setService: createStandardAction(JaegerActionKeys.SET_SERVICE)<string>(),
   setNamespace: createStandardAction(JaegerActionKeys.SET_NAMESPACE)<string>(),
-  setLookback: createStandardAction(JaegerActionKeys.SET_LOOKBACK)<string>(),
+  setLookback: createStandardAction(JaegerActionKeys.SET_LOOKBACK)<number>(),
   setTags: createStandardAction(JaegerActionKeys.SET_TAGS)<string>(),
   setLimit: createStandardAction(JaegerActionKeys.SET_LIMIT)<number>(),
   setSearchRequest: createStandardAction(JaegerActionKeys.SET_SEARCH_REQUEST)<string>(),

src/actions/JaegerThunkActions.ts

@@ -6,7 +6,7 @@ import { ServiceOverview } from '../types/ServiceList';
 import { KialiAppState } from '../store/Store';
 import { ThunkDispatch } from 'redux-thunk';
 import { KialiAppAction } from './KialiAppAction';
-import { JAEGER_QUERY } from '../config';
+import { jaegerQuery } from '../config';
 import logfmtParser from 'logfmt/lib/logfmt_parser';
 import moment from 'moment';
 
@@ -30,7 +30,7 @@ export class JaegerURLSearch {
   url: string;
 
   constructor(url: string) {
-    this.url = `${url}${JAEGER_QUERY().PATH}?${JAEGER_QUERY().EMBED.UI_EMBED}=${JAEGER_QUERY().EMBED.VERSION}`;
+    this.url = `${url}${jaegerQuery().path}?${jaegerQuery().embed.uiEmbed}=${jaegerQuery().embed.version}`;
   }
 
   addQueryParam(param: string, value: string | number) {
@@ -84,39 +84,39 @@ export const JaegerThunkActions = {
   getSearchURL: () => {
     return (dispatch: ThunkDispatch<KialiAppState, void, KialiAppAction>, getState: () => KialiAppState) => {
       const searchOptions = getState().jaegerState.search;
-      const jaegerOptions = JAEGER_QUERY().OPTIONS;
+      const jaegerOptions = jaegerQuery().options;
       const urlRequest = new JaegerURLSearch(getState().jaegerState.jaegerURL);
 
       // Search options
-      urlRequest.addQueryParam(jaegerOptions.START_TIME, searchOptions.start);
-      urlRequest.addQueryParam(jaegerOptions.END_TIME, searchOptions.end);
-      urlRequest.addQueryParam(jaegerOptions.LIMIT_TRACES, searchOptions.limit);
-      urlRequest.addQueryParam(jaegerOptions.LOOKBACK, searchOptions.lookback);
-      urlRequest.addQueryParam(jaegerOptions.MAX_DURATION, searchOptions.maxDuration);
-      urlRequest.addQueryParam(jaegerOptions.MIN_DURATION, searchOptions.minDuration);
+      urlRequest.addQueryParam(jaegerOptions.startTime, searchOptions.start);
+      urlRequest.addQueryParam(jaegerOptions.endTime, searchOptions.end);
+      urlRequest.addQueryParam(jaegerOptions.limitTraces, searchOptions.limit);
+      urlRequest.addQueryParam(jaegerOptions.lookback, searchOptions.lookback);
+      urlRequest.addQueryParam(jaegerOptions.maxDuration, searchOptions.maxDuration);
+      urlRequest.addQueryParam(jaegerOptions.minDuration, searchOptions.minDuration);
       urlRequest.addQueryParam(
-        jaegerOptions.SERVICE_SELECTOR,
+        jaegerOptions.serviceSelector,
         searchOptions.serviceSelected + '.' + searchOptions.namespaceSelected
       );
       const logfmtTags = convTagsLogfmt(searchOptions.tags);
       if (logfmtTags) {
-        urlRequest.addQueryParam(jaegerOptions.TAGS, logfmtTags);
+        urlRequest.addQueryParam(jaegerOptions.tags, logfmtTags);
       }
 
       // Embed Options
       const traceOptions = getState().jaegerState.trace;
 
       // Rename query params for 1.9 Jaeger
-      urlRequest.addQueryParam(JAEGER_QUERY().EMBED.UI_TRACE_HIDE_MINIMAP, traceOptions.hideMinimap ? '1' : '0');
-      urlRequest.addQueryParam(JAEGER_QUERY().EMBED.UI_SEARCH_HIDE_GRAPH, searchOptions.hideGraph ? '1' : '0');
-      urlRequest.addQueryParam(JAEGER_QUERY().EMBED.UI_TRACE_HIDE_SUMMARY, traceOptions.hideSummary ? '1' : '0');
+      urlRequest.addQueryParam(jaegerQuery().embed.uiTraceHideMinimap, traceOptions.hideMinimap ? '1' : '0');
+      urlRequest.addQueryParam(jaegerQuery().embed.uiSearchHideGraph, searchOptions.hideGraph ? '1' : '0');
+      urlRequest.addQueryParam(jaegerQuery().embed.uiTraceHideSummary, traceOptions.hideSummary ? '1' : '0');
 
       return dispatch(JaegerActions.setSearchRequest(urlRequest.url));
     };
   },
   setCustomLookback: (startDate: string, startTime: string, endDate: string, endTime: string) => {
     return (dispatch: ThunkDispatch<KialiAppState, void, KialiAppAction>, getState: () => KialiAppState) => {
-      if (getState().jaegerState.search.lookback === 'custom') {
+      if (getState().jaegerState.search.lookback <= 0) {
         const toTimestamp = getUnixTimeStampInMSFromForm(startDate, startTime, endDate, endTime);
         dispatch(JaegerActions.setCustomLookback(toTimestamp.start, toTimestamp.end));
       }

src/actions/__tests__/JaegerThunkActions.test.ts

@@ -1,5 +1,5 @@
 import { convTagsLogfmt, getUnixTimeStampInMSFromForm, JaegerURLSearch } from '../JaegerThunkActions';
-import { JAEGER_QUERY } from '../../config';
+import { jaegerQuery } from '../../config';
 import moment from 'moment-timezone';
 
 describe('JaegerThunkActions', () => {
@@ -38,30 +38,30 @@ describe('JaegerThunkActions', () => {
 
       it('JaegerURLSearch constructor', () => {
         expect(jaegerURLclass.url).toEqual(
-          `${url}${JAEGER_QUERY().PATH}?${JAEGER_QUERY().EMBED.UI_EMBED}=${JAEGER_QUERY().EMBED.VERSION}`
+          `${url}${jaegerQuery().path}?${jaegerQuery().embed.uiEmbed}=${jaegerQuery().embed.version}`
         );
       });
 
       it('JaegerURLSearch addQueryParam method with number value', () => {
         jaegerURLclass.addQueryParam('uiTimelineHideMinimap', 1);
         expect(jaegerURLclass.url).toEqual(
-          `${url}${JAEGER_QUERY().PATH}?${JAEGER_QUERY().EMBED.UI_EMBED}=${
-            JAEGER_QUERY().EMBED.VERSION
+          `${url}${jaegerQuery().path}?${jaegerQuery().embed.uiEmbed}=${
+            jaegerQuery().embed.version
           }&uiTimelineHideMinimap=1`
         );
         jaegerURLclass.addQueryParam('uiTimelineHideSummary', '0');
         expect(jaegerURLclass.url).toEqual(
-          `${url}${JAEGER_QUERY().PATH}?${JAEGER_QUERY().EMBED.UI_EMBED}=${
-            JAEGER_QUERY().EMBED.VERSION
+          `${url}${jaegerQuery().path}?${jaegerQuery().embed.uiEmbed}=${
+            jaegerQuery().embed.version
           }&uiTimelineHideMinimap=1&uiTimelineHideSummary=0`
         );
       });
 
       it('JaegerURLSearch addParam method', () => {
         jaegerURLclass.addParam('uiTimelineHideMinimap');
         expect(jaegerURLclass.url).toEqual(
-          `${url}${JAEGER_QUERY().PATH}?${JAEGER_QUERY().EMBED.UI_EMBED}=${
-            JAEGER_QUERY().EMBED.VERSION
+          `${url}${jaegerQuery().path}?${jaegerQuery().embed.uiEmbed}=${
+            jaegerQuery().embed.version
           }&uiTimelineHideMinimap`
         );
       });

src/components/JaegerToolbar/LookBack.tsx

@@ -6,38 +6,29 @@ import ToolbarDropdown from '../../components/ToolbarDropdown/ToolbarDropdown';
 import { JaegerActions } from '../../actions/JaegerActions';
 import { ThunkDispatch } from 'redux-thunk';
 import { KialiAppAction } from '../../actions/KialiAppAction';
+import { config } from '../../config';
 
 interface LookBackProps {
   fetching: boolean;
   setLookback: (lookback: string) => void;
-  lookback: string;
+  lookback: number;
   onChangeCustom: (when: string, dateField: string, timeField: string) => void;
 }
 
 export class LookBack extends React.PureComponent<LookBackProps, {}> {
-  lookBackOptions = {
-    '1h': 'Last Hour',
-    '2h': 'Last 2 Hours',
-    '3h': 'Last 3 Hours',
-    '6h': 'Last 6 Hours',
-    '12h': 'Last 12 Hours',
-    '24h': 'Last 24 Hours',
-    '2d': 'Last 2 Days',
-    custom: 'Custom Time Range'
-  };
+  lookBackOptions = { ...config.toolbar.intervalDuration, ...{ 0: 'Custom Time Range' } };
 
   constructor(props: LookBackProps) {
     super(props);
   }
 
   componentDidMount() {
-    this.props.setLookback(this.props.lookback);
+    this.props.setLookback(String(this.props.lookback));
   }
 
   render() {
     const { lookback, fetching, setLookback, onChangeCustom } = this.props;
-    const tz = lookback === 'custom' ? new Date().toTimeString().replace(/^.*?GMT/, 'UTC') : null;
-
+    const tz = lookback === 0 ? new Date().toTimeString().replace(/^.*?GMT/, 'UTC') : null;
     return (
       <span style={{ marginLeft: '10px' }}>
         <Col componentClass={Form.ControlLabel} style={{ marginRight: '10px' }}>
@@ -117,7 +108,7 @@ const mapStateToProps = (state: KialiAppState) => {
 const mapDispatchToProps = (dispatch: ThunkDispatch<KialiAppState, void, KialiAppAction>) => {
   return {
     setLookback: (lookback: string) => {
-      dispatch(JaegerActions.setLookback(lookback));
+      dispatch(JaegerActions.setLookback(Number(lookback)));
     }
   };
 };

src/components/JaegerToolbar/TagsControl.tsx

@@ -19,7 +19,7 @@ export class TagsControl extends React.PureComponent<TagsControlProps, {}> {
       <Card>
         <Card.Title>
           Values should be in the{' '}
-          <a href="https://brandur.org/logfmt" target="_blank">
+          <a rel="noopener noreferrer" href="https://brandur.org/logfmt" target="_blank">
             logfmt
           </a>{' '}
           format.

src/components/JaegerToolbar/__tests__/LookBack.test.tsx

@@ -3,17 +3,9 @@ import { shallow } from 'enzyme';
 import { LookBack } from '../LookBack';
 import { Form, FormGroup } from 'patternfly-react';
 import ToolbarDropdown from '../../../components/ToolbarDropdown/ToolbarDropdown';
+import { config } from '../../../config';
 
-const lookBackOptions = {
-  '1h': 'Last Hour',
-  '2h': 'Last 2 Hours',
-  '3h': 'Last 3 Hours',
-  '6h': 'Last 6 Hours',
-  '12h': 'Last 12 Hours',
-  '24h': 'Last 24 Hours',
-  '2d': 'Last 2 Days',
-  custom: 'Custom Time Range'
-};
+const lookBackOptions = { ...config.toolbar.intervalDuration, ...{ 0: 'Custom Time Range' } };
 
 describe('LookBack', () => {
   let wrapper, onChangeCustom, setLookback;
@@ -22,7 +14,7 @@ describe('LookBack', () => {
     onChangeCustom = jest.fn();
     setLookback = jest.fn();
     wrapper = shallow(
-      <LookBack onChangeCustom={onChangeCustom} setLookback={setLookback} fetching={false} lookback={''} />
+      <LookBack onChangeCustom={onChangeCustom} setLookback={setLookback} fetching={false} lookback={3600} />
     );
   });
 
@@ -33,7 +25,7 @@ describe('LookBack', () => {
 
   it('renders Extra forms when lookback is custom', () => {
     expect(wrapper.find(Form).length).toEqual(0);
-    wrapper.setProps({ lookback: 'custom' });
+    wrapper.setProps({ lookback: 0 });
     expect(wrapper.find(Form).length).toEqual(1);
     expect(wrapper.find(FormGroup).length).toEqual(2);
   });