- {{ (node !== null && node.data !== null) ? node.data.resource_type : "" }}
+ {{ (node !== undefined && node.data !== undefined) ? node.data.resource_type : "" }}
@@ -57,7 +57,9 @@ export default {
data: () => ({
tiles: [],
}),
- mounted() {},
+ mounted() {
+
+ },
};
diff --git a/forseti-visualizer-ui/src/components/BottomDetailsViolations.vue b/forseti-visualizer-ui/src/components/BottomDetailsViolations.vue
index ed7e375..08b2f10 100644
--- a/forseti-visualizer-ui/src/components/BottomDetailsViolations.vue
+++ b/forseti-visualizer-ui/src/components/BottomDetailsViolations.vue
@@ -88,7 +88,7 @@ export default {
sheetOpen: Boolean,
},
data: () => ({
- iamPolicies: {},
+ // iamPolicies: {},
rowsPerPageItems: [4, 8, 12],
pagination: {
rowsPerPage: 4,
diff --git a/forseti-visualizer-ui/src/components/Navbar.vue b/forseti-visualizer-ui/src/components/Navbar.vue
index 8970456..cb331a8 100644
--- a/forseti-visualizer-ui/src/components/Navbar.vue
+++ b/forseti-visualizer-ui/src/components/Navbar.vue
@@ -100,7 +100,7 @@
v-model="selectedFilterResources"
:items="items"
label="Filter by a list of resource types"
- v-on:change="filterResources"
+ v-on:input="filterResources"
multiple
chips
:menu-props="{ maxHeight: '400px', overflowY: true }"
@@ -153,7 +153,7 @@ export default {
computed: mapState(['resourceArray']),
watch: {
resourceArray(newValue, oldValue) {
- console.log(`Watch: Updating from ${oldValue} to ${newValue}`);
+ // console.log(`Watch: Updating from ${oldValue} to ${newValue}`);
},
},
@@ -296,12 +296,12 @@ export default {
data: () => ({
// global: set this to use JSON files vs. dynamic
// useCache: false, // default to using server data
- useCache: true, // default to using cached files.json
+ useCache: false, // default to using cached files.json
useJson: true, // false defers to using a .csv
useWideView: false, // false defers to keeping node view default screen (hxw)
// filter variables
- nodeName: 'dia-dog-flow',
+ nodeName: '',
expand: true,
expandAll: false,
showViolations: true,
diff --git a/forseti-visualizer-ui/src/components/ResourceNavbar.vue b/forseti-visualizer-ui/src/components/ResourceNavbar.vue
new file mode 100644
index 0000000..d6fde9f
--- /dev/null
+++ b/forseti-visualizer-ui/src/components/ResourceNavbar.vue
@@ -0,0 +1,240 @@
+
+
+
+
+
+
+ Search Filters
+
+
+
+
+
+ fas fa-question-circle
+
+
+
+
+ Help
+
+
+
+
+ Filter by Resource Types
+
+
+
+ Select the resource types to be searched for - these resource types are defined in Forseti.
+
+
+
+ Filter by Project
+
+
+
+ Select the Project ID within the target organization.
+
+
+
+ Filter by Inventory Index Snapshot
+
+
+
+ The Inventory Index Snapshot is a Forseti construct for everytime forseti inventories an organization. A snapshot is taken by default every 2 hours.
+
+
+
+
+
+
+ Close
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{filterData.selectedInventoryIndexId}}
+
+
+
Clear
+
+
Search
+
+
+
+
+
+
diff --git a/forseti-visualizer-ui/src/components/Resources.vue b/forseti-visualizer-ui/src/components/Resources.vue
index 0276cfd..e771444 100644
--- a/forseti-visualizer-ui/src/components/Resources.vue
+++ b/forseti-visualizer-ui/src/components/Resources.vue
@@ -1,64 +1,126 @@
-
-
-
-
-
-
- {{ props.item.name }}
- {{ props.item.resource_type }}
- {{ props.item.resource_id }}
-
-
-
-
-
-
- {{beautify(props.item) }}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{ props.item.name }}
+ {{ props.item.resource_data_name }}
+ {{ props.item.resource_type }}
+ {{ props.item.resource_id }}
+
+
+ fa-sitemap
+
+
+
+ fa-edit
+
+
+
+
+
+
+
+
+
+
+ {{beautify(props.item) }}
+
+
+
+
+
+
+
+
+
diff --git a/forseti-visualizer-ui/src/components/Violations.vue b/forseti-visualizer-ui/src/components/Violations.vue
deleted file mode 100644
index 685fc1c..0000000
--- a/forseti-visualizer-ui/src/components/Violations.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-
-
-
-
-
-
-
- {{ props.item.violationType }}
- {{ props.item.resourceName }}
- {{ props.item.violationData }}
-
-
-
-
-
-
-
- Resource data for: {{props.item.resourcePath}}
-
- {{ beautify(props.item.resourceData) }}
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/forseti-visualizer-ui/src/components/Visualizer.vue b/forseti-visualizer-ui/src/components/Visualizer.vue
deleted file mode 100644
index d4c51db..0000000
--- a/forseti-visualizer-ui/src/components/Visualizer.vue
+++ /dev/null
@@ -1,1701 +0,0 @@
-
-
-
-
-
- Forseti-Visualizer
-
-
-
-
-
-
- exit_to_app
-
-
- {{left}} {{drawer}} Drawer
-
-
-
-
-
-
-
-
-
-
-
-
- Reset Zoom
-
-
-
-
-
- fas fa-cog
-
-
-
-
- Settings
-
-
-
-
-
- Close
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Search
-
-
Reset to Org
-
Set Parent
-
-
-
-
-
-
-
-
-
-
Explain Identity
-
-
-
- +
- -
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/forseti-visualizer-ui/src/constants/VisualizerConfig.js b/forseti-visualizer-ui/src/constants/VisualizerConfig.js
index ef4b102..17085cb 100644
--- a/forseti-visualizer-ui/src/constants/VisualizerConfig.js
+++ b/forseti-visualizer-ui/src/constants/VisualizerConfig.js
@@ -33,9 +33,6 @@ const VisualizerConfig = {
DEFAULT_WIDTH: 1200,
NODE_RADIUS: 22, // in 'px'
- // TOOLTIP
- TOOLTIP_VIOLATION_BG_COLOR: 'pink',
-
// NODE BG IMAGE
NODE_IMG_X: -16,
NODE_IMG_Y: -16,
diff --git a/forseti-visualizer-ui/src/main.js b/forseti-visualizer-ui/src/main.js
index fa39f9a..d236ae1 100644
--- a/forseti-visualizer-ui/src/main.js
+++ b/forseti-visualizer-ui/src/main.js
@@ -17,10 +17,8 @@ import './plugins/vuetify';
import VueRouter from 'vue-router';
import App from './App.vue';
-import Violations from './components/Violations';
import Viz from './components/Body';
import Resources from './components/Resources';
-import Visualizer from './components/Visualizer';
Vue.use(VueRouter);
@@ -37,18 +35,10 @@ const routes = [{
component: Viz,
props: true
},
- {
- path: '/violations',
- component: Violations
- },
{
path: '/resources',
component: Resources
},
- {
- path: '/visualizer',
- component: Visualizer
- },
]
Vue.config.productionTip = false;
diff --git a/forseti-visualizer-ui/src/services/DataService.js b/forseti-visualizer-ui/src/services/DataService.js
index 3381a55..ade6396 100644
--- a/forseti-visualizer-ui/src/services/DataService.js
+++ b/forseti-visualizer-ui/src/services/DataService.js
@@ -21,19 +21,21 @@ class DataService {
*/
constructor() {
// THIS SHOULD BE ENABLED THIS WHEN DEPLOYING ALONE WITH forseti-visualizer
- // this.host = 'http://localhost:8080';
+ this.host = 'http://localhost:8080';
// THIS SHOULD BE ENABLED THIS WHEN DEPLOYING VIA FORSETI-API
- this.host = '';
+ // this.host = '';
}
/**
* @function getForsetiResources
* @description gets forseti resources (for structure, reference ./forseti-visualizer-ui/public/dataset1_resources.json)
+ * @param parentId
* @return promise containing an array of forseti-resources
*/
- getForsetiResources() {
- let url = `${this.host}/api/forseti/resources`;
+ getForsetiResources(parentId) {
+ // let url = `${this.host}/api/forseti/resources`;
+ let url = `${this.host}/api/forseti/resources/${parentId ? parentId : ''}`;
return $.get(url);
}
diff --git a/forseti-visualizer-ui/src/services/Filters.js b/forseti-visualizer-ui/src/services/Filters.js
index b6bed23..61f2bc2 100644
--- a/forseti-visualizer-ui/src/services/Filters.js
+++ b/forseti-visualizer-ui/src/services/Filters.js
@@ -14,7 +14,7 @@
let Filters = {
nonNullAndActive: function (data) {
- if (data.qq === null || data.qq === 'ACTIVE') return true;
+ if (data.lifecycle_state === null || data.lifecycle_state === 'ACTIVE') return true;
return false;
},
/**
diff --git a/forseti-visualizer-ui/src/services/TooltipRenderer.js b/forseti-visualizer-ui/src/services/TooltipRenderer.js
new file mode 100644
index 0000000..cf4e034
--- /dev/null
+++ b/forseti-visualizer-ui/src/services/TooltipRenderer.js
@@ -0,0 +1,103 @@
+// Copyright 2019 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import ColorConfig from '../constants/ColorConfig';
+
+let ResourceTypeTooltipRenderer = {
+ createList: function (dictionary) {
+ // expected object: { action: [thingsToDo1, thingsToDo2], action2: [] }
+ let listHtml = '
';
+ for (let key in dictionary) {
+ let value = dictionary[key];
+
+ listHtml += `${key}: `;
+
+ if (value) listHtml += '';
+ for (let subKey in value) {
+ let subValue = value[subKey];
+
+ listHtml += `${subValue} `;
+ }
+ if (value) listHtml += ' ';
+ }
+ listHtml += '';
+ return listHtml;
+ },
+
+ renderViolations: function (violations) {
+ let content = '
';
+ for (let i = 0; i < violations.length; i++) {
+ content += this.render(violations[i].violation_type, violations[i]);
+ }
+ content += '
';
+ return content;
+ },
+
+ render: function (violationType, violation) {
+ switch (violationType) {
+ case 'FIREWALL_BLACKLIST_VIOLATION':
+ // create list of recommended action
+ let recommendedActionsList = this.createList(
+ JSON.parse(violation.violation_data).recommended_actions);
+
+ return `
+
+
${violation.violation_type}
+ ${violation.rule_name} has been violated.
+ `;
+ default:
+ return `
+
+
${violation.violation_type}
+ ${violation.rule_name}
+ `;
+ }
+ }
+}
+
+let TooltipRenderer = {
+ getTooltipHtml: function (violationExists, d, violationsMap) {
+ let tooltipContent = '';
+
+ if (violationExists) {
+ console.log(violationsMap[d.data.full_name])
+
+ tooltipContent = ResourceTypeTooltipRenderer.renderViolations(
+ violationsMap[d.data.full_name]);
+ } else { // violation does NOT exist
+ tooltipContent = `
+
+
${d.data.resource_name}
+ ${d.data.resource_data_name}
+ `;
+ }
+ return tooltipContent;
+ },
+
+ getTooltipBackground: function (violationExists) {
+ return violationExists ?
+ ColorConfig.DANGER :
+ ColorConfig.NODE_BG_COLOR;
+ }
+};
+
+export default TooltipRenderer;
\ No newline at end of file
diff --git a/forseti-visualizer-ui/src/types/ResourceNode.js b/forseti-visualizer-ui/src/types/ResourceNode.js
index 4b0a34f..afdd363 100644
--- a/forseti-visualizer-ui/src/types/ResourceNode.js
+++ b/forseti-visualizer-ui/src/types/ResourceNode.js
@@ -24,7 +24,7 @@ class ResourceNode {
this.image = "/img/Compute Engine.239b71be.png";
this.inventory_index_id = 1552609278876965;
this.parent_id = 1087601;
- this.qq = null;
+ this.lifecycle_state = null;
this.resource_data_displayname = "gke-tf-lb-https-gke-default-pool-25a75700-wzfq";
this.resource_data_name = "gke-tf-lb-https-gke-default-pool-25a75700-wzfq";
this.resource_id = "1191788173398596818";
diff --git a/test b/test
deleted file mode 100644
index 0ddf2ba..0000000
--- a/test
+++ /dev/null
@@ -1 +0,0 @@
-i
diff --git a/tools/cloud_sql_proxy b/tools/cloud_sql_proxy
new file mode 100755
index 0000000..0cb6279
Binary files /dev/null and b/tools/cloud_sql_proxy differ
diff --git a/tools/start_cloud_sql_proxy.sample.sh b/tools/start_cloud_sql_proxy.sample.sh
new file mode 100644
index 0000000..f899ce4
--- /dev/null
+++ b/tools/start_cloud_sql_proxy.sample.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+INSTANCE_CONNECTION_NAME="[PROJECT_ID]:[CLOUDSQL_REGION]:[CLOUDSQL_INSTANCE_ID]"
+
+./cloud_sql_proxy -instances=$INSTANCE_CONNECTION_NAME=tcp:3306
\ No newline at end of file
diff --git a/tools/start_cloud_sql_proxy_fs-2-23.sh b/tools/start_cloud_sql_proxy_fs-2-23.sh
new file mode 100755
index 0000000..b894021
--- /dev/null
+++ b/tools/start_cloud_sql_proxy_fs-2-23.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+INSTANCE_CONNECTION_NAME="fs-2-23:us-west1:forseti-server-db-d4bc233d"
+
+./cloud_sql_proxy -instances=$INSTANCE_CONNECTION_NAME=tcp:3306
\ No newline at end of file