Skip to content

Commit 309e7ad

Browse files
nxanilnxanil
committed
Revert "Merge branch 'master' into feature/middleware-setup"
This reverts commit e3e026b, reversing changes made to 1792c06.
1 parent e3e026b commit 309e7ad

File tree

25 files changed

+326
-597
lines changed

25 files changed

+326
-597
lines changed

‎docs/README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,6 @@ Display nice Pie or Donut graphs
334334
- **multiSelectable** To enable/disable multi select feature - default is `false`
335335
- **showCheckboxes** To show checkboxes to select rows - default is `false`
336336
- **enableSelectAll** To enable/disable select all feature - Default is `true`
337-
- **selectedColumn** (string) Compare `selectedColumn` value with all available datas and if equal to selected row, then save all matched records in store under "matchedRows"
338-
339337
- **highlight** (Array of columns) Highlighted the rows if value of columns is not null
340338
- **hidePagination** Hide paging and search bar if data size is less than pagination limit - Default is `true`
341339
- **searchBar** Default is `true`

‎server/app/configurations/dashboards/aarNSG.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
{
1818
"label": "Detail View",
1919
"url": "/dashboards/aarNSGDetail"
20-
},
21-
{
22-
"label": "NATT Events",
23-
"url": "/dashboards/aarNSGNATTEvents"
2420
}
2521
],
2622
"filterOptions": {

‎server/app/configurations/dashboards/aarNSGDetail.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@
2020
{
2121
"label": "Detail View",
2222
"url": "/dashboards/aarNSGDetail"
23-
},
24-
{
25-
"label": "NATT Events",
26-
"url": "/dashboards/aarNSGNATTEvents"
2723
}
2824
],
2925
"filterOptions": {

‎server/app/configurations/dashboards/vssDomainFlow.json‎

Lines changed: 83 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,8 @@
55
"title": "{{domainName:VSS Domain}}",
66
"titleIcon": "domain",
77
"visualizations": [
8-
{ "id": "vss-domain-flow-flow-metric", "x": 1, "y": 0, "w": 2, "h": 5, "minW": 2, "minH": 5, "static": true},
9-
{ "id": "vss-domain-flow-explicit-allow-metric", "x": 3, "y": 0, "w": 2, "h": 5, "minW": 2, "minH": 5, "static": true},
10-
{ "id": "vss-domain-flow-explicit-deny-metric", "x": 5, "y": 0, "w": 2, "h": 5, "minW": 2, "minH": 5, "static": true},
11-
{ "id": "vss-domain-flow-default-allow-metric", "x": 7, "y": 0, "w": 2, "h": 5, "minW": 2, "minH": 5, "static": true},
12-
{ "id": "vss-domain-flow-default-deny-metric", "x": 9, "y": 0, "w": 2, "h": 5, "minW": 2, "minH": 5, "static": true},
13-
{ "id": "vss-domain-flow-topx-source", "x": 1, "y": 2, "w": 5, "h": 25, "minW": 2, "minH": 12},
14-
{ "id": "vss-domain-flow-topx-dest", "x": 6, "y": 2, "w": 5, "h": 25, "minW": 2, "minH": 12},
15-
{ "id": "vss-domain-flow", "x": 1, "y": 27, "w": 5, "h": 25, "minW": 2, "minH": 12},
16-
{ "id": "vss-domain-flow-table", "x": 6, "y": 27, "w": 5, "h": 25, "minW": 2 , "minH": 12}
8+
{ "id": "vss-domain-flow", "x": 1, "y": 0, "w": 5, "h": 25, "minW": 2, "minH": 12},
9+
{ "id": "vss-domain-flow-table", "x": 6, "y": 0, "w": 5, "h": 25, "minW": 2 , "minH": 12}
1710
],
1811
"links": [
1912
{
@@ -44,5 +37,85 @@
4437
"label": "Flow Explorer",
4538
"url": "/dashboards/vssDomainFlowExplorer"
4639
}
47-
]
40+
],
41+
"filterOptions": {
42+
"Source Field": {
43+
"parameter": "source_field",
44+
"default": "pg",
45+
"options": [
46+
{
47+
"label": "Endpoint's Domain",
48+
"value": "endpoint-domain"
49+
},
50+
{
51+
"label": "Endpoint's Subnet",
52+
"value": "endpoint-subnet"
53+
},
54+
{
55+
"label": "Endpoint's Zone",
56+
"value": "endpoint-zone"
57+
},
58+
{
59+
"label": "Subnet",
60+
"value": "subnet"
61+
},
62+
{
63+
"label": "Zone",
64+
"value": "zone"
65+
},
66+
{
67+
"label": "PG",
68+
"value": "pg",
69+
"default": true
70+
},
71+
{
72+
"label": "Network Macro Group",
73+
"value": "network-macro-group"
74+
},
75+
{
76+
"label": "Any",
77+
"value": "ANY"
78+
}
79+
]
80+
},
81+
"Destination Field": {
82+
"parameter": "destination_field",
83+
"default": "pg",
84+
"options": [
85+
{
86+
"label": "Endpoint's Domain",
87+
"value": "endpoint-domain"
88+
},
89+
{
90+
"label": "Endpoint's Subnet",
91+
"value": "endpoint-subnet"
92+
},
93+
{
94+
"label": "Endpoint's Zone",
95+
"value": "endpoint-zone"
96+
},
97+
{
98+
"label": "Subnet",
99+
"value": "subnet"
100+
},
101+
{
102+
"label": "Zone",
103+
"value": "zone"
104+
},
105+
{
106+
"label": "PG",
107+
"value": "pg",
108+
"default": true
109+
},
110+
{
111+
"label": "Network Macro Group",
112+
"value": "network-macro-group"
113+
},
114+
{
115+
"label": "Any",
116+
"value": "ANY"
117+
}
118+
]
119+
}
120+
}
48121
}

‎server/app/configurations/queries/vss-enterprise-acldeny-metric.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
},
1818
{
1919
"term": {
20-
"type": "DENY"
20+
"type": "ACL_DENY"
2121
}
2222
}
2323
]

‎server/app/configurations/queries/wifi-branch-ssid-linechart.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"Users": {
4848
"terms": {
4949
"field": "client_mac",
50-
"size": 100,
50+
"size": 0,
5151
"order": {
5252
"SumOf": "desc"
5353
}

‎server/app/configurations/visualizations/aar-flow-sla-heatmap.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@
2424
{ "column": "date_histo", "label": "Timestamp", "timeFormat": "%b %d, %y %X"},
2525
{ "column": "application", "label": "Application" },
2626
{ "column": "slastatus", "label": "Status" }
27-
],
28-
"heatmapColor": {
29-
"InSla": "#b3d645"
30-
}
27+
]
3128
},
3229
"listeners": [
3330
{

‎server/app/configurations/visualizations/vss-domain-flow-explorer.json‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"creationDate": "10/23/2017",
99
"data": {
1010
"limit": 100,
11-
"selectedColumn": "nuage_metadata.flowid",
1211
"columns": [
1312
{ "column": "timestamp", "label": "Timestamp", "timeFormat": "%b %d, %y %X"},
1413
{ "column": "sourceip", "label": "SIP" },
@@ -17,22 +16,20 @@
1716
{ "column": "destinationport", "label": "D-Port" },
1817
{ "column": "protocol", "label": "Proto" },
1918
{ "column": "type", "label": "Type"},
20-
{ "column": "nuage_metadata.direction", "label": "Direction"},
2119
{ "column": "nuage_metadata.subnetName", "label": "Subnet", "totalCharacters": 16, "tooltip" : {"column": "nuage_metadata.subnetName"} },
2220
{ "column": "nuage_metadata.zoneName", "label": "Zone", "totalCharacters": 16, "tooltip" : {"column": "nuage_metadata.zoneName"} },
23-
{ "column": "nuage_metadata.aclId", "label": "ACL-ID", "totalCharacters": 13, "tooltip" : {"column": "nuage_metadata.aclId"} },
24-
{ "column": "nuage_metadata.vfrPolicyID", "label": "VFW-Rule-ID", "totalCharacters": 13, "tooltip" : {"column": "nuage_metadata.vfrPolicyID"} },
25-
{ "column": "nuage_metadata.acl_source_type", "label": "ACL-Source-Type" },
26-
{ "column": "nuage_metadata.acl_source_name", "label": "ACL-Source-Name", "totalCharacters": 16, "tooltip" : {"column": "nuage_metadata.acl_source_name"} },
27-
{ "column": "nuage_metadata.acl_destination_type", "label": "ACL-Dest-Type" },
28-
{ "column": "nuage_metadata.acl_destination_name", "label": "ACL-Dest-Name", "totalCharacters": 16, "tooltip" : {"column": "nuage_metadata.acl_destination_name"} },
21+
{ "column": "nuage_metadata.acl_source_type", "label": "Asso-Source-Type" },
22+
{ "column": "nuage_metadata.acl_source_name", "label": "Asso-Source-Name", "totalCharacters": 16, "tooltip" : {"column": "nuage_metadata.acl_source_name"} },
23+
{ "column": "nuage_metadata.acl_destination_type", "label": "Asso-Dest-Type" },
24+
{ "column": "nuage_metadata.acl_destination_name", "label": "Asso-Dest-Name", "totalCharacters": 16, "tooltip" : {"column": "nuage_metadata.acl_destination_name"} },
2925
{ "column": "nuage_metadata.l7ApplicationName", "label": "L7Application"},
3026
{ "column": "nuage_metadata.service", "label": "Service" },
3127
{ "column": "nuage_metadata.serviceGroup", "label": "Service-Group" },
32-
{ "column": "underlayflow", "label": "Underlay-flow" },
3328
{ "column": "sourcemac", "label": "SMAC" },
3429
{ "column": "destinationmac", "label": "DMAC" },
35-
{ "column": "packets", "label": "Packets" }
30+
{ "column": "packets", "label": "Packets" },
31+
{ "column": "nuage_metadata.aclId", "label": "ACL", "totalCharacters": 13, "tooltip" : {"column": "nuage_metadata.aclId"} },
32+
{ "column": "nuage_metadata.vfrPolicyID", "label": "PolicyID", "totalCharacters": 13, "tooltip" : {"column": "nuage_metadata.vfrPolicyID"} }
3633
]
3734
},
3835
"menu": [

‎server/app/configurations/visualizations/vss-domain-flow.json‎

Lines changed: 0 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -20,85 +20,5 @@
2020
"destination": "destination"
2121
}
2222
}],
23-
"filterOptions": {
24-
"Source Field": {
25-
"parameter": "source_field",
26-
"default": "pg",
27-
"options": [
28-
{
29-
"label": "Endpoint's Domain",
30-
"value": "endpoint-domain"
31-
},
32-
{
33-
"label": "Endpoint's Subnet",
34-
"value": "endpoint-subnet"
35-
},
36-
{
37-
"label": "Endpoint's Zone",
38-
"value": "endpoint-zone"
39-
},
40-
{
41-
"label": "Subnet",
42-
"value": "subnet"
43-
},
44-
{
45-
"label": "Zone",
46-
"value": "zone"
47-
},
48-
{
49-
"label": "PG",
50-
"value": "pg",
51-
"default": true
52-
},
53-
{
54-
"label": "Network Macro Group",
55-
"value": "network-macro-group"
56-
},
57-
{
58-
"label": "Any",
59-
"value": "ANY"
60-
}
61-
]
62-
},
63-
"Destination Field": {
64-
"parameter": "destination_field",
65-
"default": "pg",
66-
"options": [
67-
{
68-
"label": "Endpoint's Domain",
69-
"value": "endpoint-domain"
70-
},
71-
{
72-
"label": "Endpoint's Subnet",
73-
"value": "endpoint-subnet"
74-
},
75-
{
76-
"label": "Endpoint's Zone",
77-
"value": "endpoint-zone"
78-
},
79-
{
80-
"label": "Subnet",
81-
"value": "subnet"
82-
},
83-
{
84-
"label": "Zone",
85-
"value": "zone"
86-
},
87-
{
88-
"label": "PG",
89-
"value": "pg",
90-
"default": true
91-
},
92-
{
93-
"label": "Network Macro Group",
94-
"value": "network-macro-group"
95-
},
96-
{
97-
"label": "Any",
98-
"value": "ANY"
99-
}
100-
]
101-
}
102-
},
10323
"query": "vss-domain-flow"
10424
}

‎src/components/App/MainMenu.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,6 @@ class MainMenuView extends React.Component {
199199
{this.renderNSGsMenu()}
200200
</div>
201201
]}
202-
leftIcon={
203-
<img style={style.iconMenu} src={`${process.env.PUBLIC_URL}/icons/icon-enterprise.png`} alt="N" />
204-
}
205202
/>
206203
)
207204
})}
@@ -275,6 +272,10 @@ const actionCreators = (dispatch) => ({
275272
dispatch(InterfaceActions.toggleMainMenu());
276273
},
277274

275+
setPageTitle: (aTitle) => {
276+
dispatch(InterfaceActions.updateTitle(aTitle));
277+
},
278+
278279
goTo: function(link, context) {
279280
dispatch(push({pathname:link, query:context}));
280281
},

0 commit comments

Comments
 (0)