Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
94f604e
WIP Google Cloud Shell
animehart Aug 2, 2023
17fb1ba
jest test fix + update
animehart Aug 3, 2023
a0127fe
more updates
animehart Aug 3, 2023
87218da
Merge branch 'main' into cis-gcp-cloud-shell
animehart Aug 3, 2023
6ef5d60
Merge branch 'cis-gcp-cloud-shell' of github.com:animehart/kibana int…
animehart Aug 3, 2023
f8097c2
post install modal now has active url
animehart Aug 3, 2023
6b1c3fe
UI update to include Organization option (disabled)
animehart Aug 4, 2023
368ceca
Added agent installation flyout for Google Cloud Shell
animehart Aug 5, 2023
1fe23a1
fix check failure
animehart Aug 5, 2023
a483c22
bug fix + test for getCloudShellFromAgentPolicy
animehart Aug 5, 2023
359ea43
translate id update
animehart Aug 5, 2023
40db94a
Merge branch 'main' into cis-gcp-cloud-shell
animehart Aug 5, 2023
d46101a
fix conflict
animehart Aug 10, 2023
fdeea1b
pr comments
animehart Aug 10, 2023
0322e9a
pr comments + improvements on widget
animehart Aug 10, 2023
a45fb7a
fix conflict
animehart Aug 10, 2023
f4cc883
fix failed jest
animehart Aug 10, 2023
10572c2
added beta tag and some unit test for getCspmCloudShellDefaultValue t…
animehart Aug 10, 2023
36db152
Merge branch 'main' into cis-gcp-cloud-shell-improvements
animehart Aug 10, 2023
dc777e6
small bug fix
animehart Aug 10, 2023
34a5808
PR comments
animehart Aug 11, 2023
0138c7d
added google cloud logo
animehart Aug 14, 2023
9daf0de
Merge branch 'main' into cis-gcp-cloud-shell-googleIcon
animehart Aug 14, 2023
28d2807
Merge branch 'main' into cis-gcp-cloud-shell-googleIcon
animehart Aug 14, 2023
df140f6
pr comments
animehart Aug 14, 2023
bf534ec
[CI] Auto-commit changed files from 'node scripts/precommit_hook.js -…
kibanamachine Aug 14, 2023
442e692
Merge branch 'main' into cis-gcp-cloud-shell-googleIcon
animehart Aug 14, 2023
e52b09a
Merge branch 'main' into cis-gcp-cloud-shell-googleIcon
kibanamachine Aug 14, 2023
46c9fef
Merge branch 'main' into cis-gcp-cloud-shell-googleIcon
animehart Aug 14, 2023
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import {
import eksLogo from '../assets/icons/cis_eks_logo.svg';
import aksLogo from '../assets/icons/cis_aks_logo.svg';
import gkeLogo from '../assets/icons/cis_gke_logo.svg';
import googleCloudLogo from '../assets/icons/google_cloud_logo.svg';

export const statusColors = {
passed: euiThemeVars.euiColorSuccess,
Expand Down Expand Up @@ -91,7 +92,7 @@ export const cloudPostureIntegrations: CloudPostureIntegrations = {
benchmark: i18n.translate('xpack.csp.cspmIntegration.gcpOption.benchmarkTitle', {
defaultMessage: 'CIS GCP',
}),
icon: 'logoGCP',
icon: googleCloudLogo,
isBeta: true,
},
{
Expand Down Expand Up @@ -191,7 +192,7 @@ export const cloudPostureIntegrations: CloudPostureIntegrations = {
defaultMessage: 'GCP',
}),
disabled: true,
icon: 'logoGCP',
icon: googleCloudLogo,
tooltip: i18n.translate('xpack.csp.vulnMgmtIntegration.gcpOption.tooltipContent', {
defaultMessage: 'Coming soon',
}),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ export const AccountsEvaluatedWidget = ({

return (
<>
<EuiFlexGroup gutterSize="s">
<EuiFlexGroup gutterSize="m">
{cisAwsClusterAmount > 0 && (
<EuiFlexItem grow={false}>
<EuiFlexGroup gutterSize="xs">
<EuiFlexGroup gutterSize="xs" alignItems="center">
<EuiFlexItem>
<CISBenchmarkIcon type={CIS_AWS} name={cisAwsBenchmarkName} />
<CISBenchmarkIcon type={CIS_AWS} name={cisAwsBenchmarkName} size={'l'} />
</EuiFlexItem>
<EuiFlexItem
grow={false}
Expand All @@ -61,9 +61,9 @@ export const AccountsEvaluatedWidget = ({
)}
{cisGcpClusterAmount > 0 && (
<EuiFlexItem>
<EuiFlexGroup gutterSize="xs">
<EuiFlexGroup gutterSize="xs" alignItems="center">
<EuiFlexItem>
<CISBenchmarkIcon type={CIS_GCP} name={cisGcpBenchmarkName} />
<CISBenchmarkIcon type={CIS_GCP} name={cisGcpBenchmarkName} size={'l'} />
</EuiFlexItem>
<EuiFlexItem
grow={false}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,17 @@
*/

import React from 'react';
import { EuiIcon, EuiToolTip } from '@elastic/eui';
import { EuiIcon, EuiToolTip, IconSize } from '@elastic/eui';
import { CSSInterpolation } from '@emotion/serialize';
import type { BenchmarkId } from '../../common/types';
import cisEksIcon from '../assets/icons/cis_eks_logo.svg';
import googleCloudLogo from '../assets/icons/google_cloud_logo.svg';

interface Props {
type: BenchmarkId;
name?: string;
style?: CSSInterpolation;
size?: IconSize;
}

const getBenchmarkIdIconType = (props: Props): string => {
Expand All @@ -24,7 +26,7 @@ const getBenchmarkIdIconType = (props: Props): string => {
case 'cis_aws':
return 'logoAWS';
case 'cis_gcp':
return 'logoGCP';
return googleCloudLogo;
case 'cis_k8s':
default:
return 'logoKubernetes';
Expand All @@ -33,6 +35,6 @@ const getBenchmarkIdIconType = (props: Props): string => {

export const CISBenchmarkIcon = (props: Props) => (
<EuiToolTip content={props.name}>
<EuiIcon type={getBenchmarkIdIconType(props)} size="xl" css={props.style} />
<EuiIcon type={getBenchmarkIdIconType(props)} size={props.size || 'xl'} css={props.style} />
</EuiToolTip>
);