diff --git a/e2etests/testdata/stable/teleport_grid/dagre/board.exp.json b/e2etests/testdata/stable/teleport_grid/dagre/board.exp.json
index dd81703e21..6aa7bde235 100644
--- a/e2etests/testdata/stable/teleport_grid/dagre/board.exp.json
+++ b/e2etests/testdata/stable/teleport_grid/dagre/board.exp.json
@@ -8,10 +8,10 @@
"type": "rectangle",
"pos": {
"x": 0,
- "y": 41
+ "y": 204
},
- "width": 423,
- "height": 499,
+ "width": 272,
+ "height": 461,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -40,7 +40,7 @@
"underline": false,
"labelWidth": 60,
"labelHeight": 36,
- "labelPosition": "OUTSIDE_TOP_CENTER",
+ "labelPosition": "INSIDE_TOP_CENTER",
"zIndex": 0,
"level": 1
},
@@ -48,11 +48,11 @@
"id": "via",
"type": "rectangle",
"pos": {
- "x": 694,
- "y": 331
+ "x": 543,
+ "y": 130
},
- "width": 472,
- "height": 584,
+ "width": 236,
+ "height": 610,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -81,7 +81,7 @@
"underline": false,
"labelWidth": 33,
"labelHeight": 36,
- "labelPosition": "OUTSIDE_TOP_CENTER",
+ "labelPosition": "INSIDE_TOP_CENTER",
"zIndex": 0,
"level": 1
},
@@ -89,11 +89,11 @@
"id": "teleport",
"type": "rectangle",
"pos": {
- "x": 1437,
- "y": 564
+ "x": 1050,
+ "y": 283
},
- "width": 573,
- "height": 1231,
+ "width": 584,
+ "height": 303,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -122,6 +122,7 @@
"underline": false,
"labelWidth": 0,
"labelHeight": 0,
+ "labelPosition": "INSIDE_TOP_CENTER",
"zIndex": 0,
"level": 1
},
@@ -129,11 +130,11 @@
"id": "jita",
"type": "rectangle",
"pos": {
- "x": 2512,
- "y": 844
+ "x": 2136,
+ "y": 0
},
- "width": 423,
- "height": 688,
+ "width": 820,
+ "height": 212,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -162,7 +163,7 @@
"underline": false,
"labelWidth": 266,
"labelHeight": 36,
- "labelPosition": "OUTSIDE_TOP_CENTER",
+ "labelPosition": "INSIDE_TOP_CENTER",
"zIndex": 0,
"level": 1
},
@@ -170,11 +171,11 @@
"id": "infra",
"type": "rectangle",
"pos": {
- "x": 2512,
- "y": 1634
+ "x": 2255,
+ "y": 232
},
- "width": 423,
- "height": 982,
+ "width": 582,
+ "height": 344,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -203,7 +204,7 @@
"underline": false,
"labelWidth": 160,
"labelHeight": 36,
- "labelPosition": "OUTSIDE_TOP_CENTER",
+ "labelPosition": "INSIDE_TOP_CENTER",
"zIndex": 0,
"level": 1
},
@@ -211,8 +212,8 @@
"id": "identity provider",
"type": "rectangle",
"pos": {
- "x": 830,
- "y": 1261
+ "x": 2446,
+ "y": 596
},
"width": 201,
"height": 118,
@@ -260,56 +261,15 @@
"zIndex": 0,
"level": 1
},
- {
- "id": "users.rows",
- "type": "rectangle",
- "pos": {
- "x": 185,
- "y": 61
- },
- "width": 53,
- "height": 66,
- "opacity": 1,
- "strokeDash": 0,
- "strokeWidth": 2,
- "borderRadius": 0,
- "fill": "B5",
- "stroke": "B1",
- "shadow": false,
- "3d": false,
- "multiple": false,
- "double-border": false,
- "tooltip": "",
- "link": "",
- "icon": null,
- "iconPosition": "",
- "blend": false,
- "fields": null,
- "methods": null,
- "columns": null,
- "label": "2",
- "fontSize": 16,
- "fontFamily": "DEFAULT",
- "language": "",
- "color": "N1",
- "italic": false,
- "bold": true,
- "underline": false,
- "labelWidth": 8,
- "labelHeight": 21,
- "labelPosition": "INSIDE_MIDDLE_CENTER",
- "zIndex": 0,
- "level": 2
- },
{
"id": "users.Engineers",
"type": "oval",
"pos": {
- "x": 136,
- "y": 147
+ "x": 60,
+ "y": 264
},
"width": 152,
- "height": 178,
+ "height": 152,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -358,11 +318,11 @@
"id": "users.Machines",
"type": "oval",
"pos": {
- "x": 137,
- "y": 345
+ "x": 60,
+ "y": 456
},
"width": 149,
- "height": 175,
+ "height": 149,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -407,53 +367,12 @@
"zIndex": 0,
"level": 2
},
- {
- "id": "via.columns",
- "type": "rectangle",
- "pos": {
- "x": 904,
- "y": 399
- },
- "width": 52,
- "height": 66,
- "opacity": 1,
- "strokeDash": 0,
- "strokeWidth": 2,
- "borderRadius": 0,
- "fill": "B5",
- "stroke": "B1",
- "shadow": false,
- "3d": false,
- "multiple": false,
- "double-border": false,
- "tooltip": "",
- "link": "",
- "icon": null,
- "iconPosition": "",
- "blend": false,
- "fields": null,
- "methods": null,
- "columns": null,
- "label": "1",
- "fontSize": 16,
- "fontFamily": "DEFAULT",
- "language": "",
- "color": "N1",
- "italic": false,
- "bold": true,
- "underline": false,
- "labelWidth": 7,
- "labelHeight": 21,
- "labelPosition": "INSIDE_MIDDLE_CENTER",
- "zIndex": 0,
- "level": 2
- },
{
"id": "via.https",
"type": "rectangle",
"pos": {
- "x": 877,
- "y": 485
+ "x": 603,
+ "y": 190
},
"width": 107,
"height": 66,
@@ -493,8 +412,8 @@
"id": "via.kubectl",
"type": "rectangle",
"pos": {
- "x": 875,
- "y": 571
+ "x": 603,
+ "y": 296
},
"width": 111,
"height": 66,
@@ -534,8 +453,8 @@
"id": "via.tsh",
"type": "rectangle",
"pos": {
- "x": 891,
- "y": 657
+ "x": 603,
+ "y": 402
},
"width": 79,
"height": 66,
@@ -575,8 +494,8 @@
"id": "via.api",
"type": "rectangle",
"pos": {
- "x": 891,
- "y": 743
+ "x": 603,
+ "y": 508
},
"width": 79,
"height": 66,
@@ -616,8 +535,8 @@
"id": "via.db clients",
"type": "rectangle",
"pos": {
- "x": 872,
- "y": 829
+ "x": 603,
+ "y": 614
},
"width": 116,
"height": 66,
@@ -653,94 +572,12 @@
"zIndex": 0,
"level": 2
},
- {
- "id": "teleport.rows",
- "type": "rectangle",
- "pos": {
- "x": 1697,
- "y": 809
- },
- "width": 53,
- "height": 66,
- "opacity": 1,
- "strokeDash": 0,
- "strokeWidth": 2,
- "borderRadius": 0,
- "fill": "B5",
- "stroke": "B1",
- "shadow": false,
- "3d": false,
- "multiple": false,
- "double-border": false,
- "tooltip": "",
- "link": "",
- "icon": null,
- "iconPosition": "",
- "blend": false,
- "fields": null,
- "methods": null,
- "columns": null,
- "label": "2",
- "fontSize": 16,
- "fontFamily": "DEFAULT",
- "language": "",
- "color": "N1",
- "italic": false,
- "bold": true,
- "underline": false,
- "labelWidth": 8,
- "labelHeight": 21,
- "labelPosition": "INSIDE_MIDDLE_CENTER",
- "zIndex": 0,
- "level": 2
- },
- {
- "id": "teleport.columns",
- "type": "rectangle",
- "pos": {
- "x": 1697,
- "y": 895
- },
- "width": 53,
- "height": 66,
- "opacity": 1,
- "strokeDash": 0,
- "strokeWidth": 2,
- "borderRadius": 0,
- "fill": "B5",
- "stroke": "B1",
- "shadow": false,
- "3d": false,
- "multiple": false,
- "double-border": false,
- "tooltip": "",
- "link": "",
- "icon": null,
- "iconPosition": "",
- "blend": false,
- "fields": null,
- "methods": null,
- "columns": null,
- "label": "2",
- "fontSize": 16,
- "fontFamily": "DEFAULT",
- "language": "",
- "color": "N1",
- "italic": false,
- "bold": true,
- "underline": false,
- "labelWidth": 8,
- "labelHeight": 21,
- "labelPosition": "INSIDE_MIDDLE_CENTER",
- "zIndex": 0,
- "level": 2
- },
{
"id": "teleport.t",
"type": "text",
"pos": {
- "x": 1663,
- "y": 981
+ "x": 1110,
+ "y": 343
},
"width": 122,
"height": 51,
@@ -772,6 +609,7 @@
"underline": false,
"labelWidth": 122,
"labelHeight": 51,
+ "labelPosition": "INSIDE_MIDDLE_CENTER",
"zIndex": 0,
"level": 2
},
@@ -779,8 +617,8 @@
"id": "teleport.inp",
"type": "text",
"pos": {
- "x": 1573,
- "y": 1052
+ "x": 1272,
+ "y": 343
},
"width": 302,
"height": 51,
@@ -812,6 +650,7 @@
"underline": false,
"labelWidth": 302,
"labelHeight": 51,
+ "labelPosition": "INSIDE_MIDDLE_CENTER",
"zIndex": 0,
"level": 2
},
@@ -819,11 +658,11 @@
"id": "teleport.Audit Log",
"type": "rectangle",
"pos": {
- "x": 1654,
- "y": 1123
+ "x": 1110,
+ "y": 434
},
"width": 140,
- "height": 118,
+ "height": 92,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -872,11 +711,11 @@
"id": "teleport.Cert Authority",
"type": "rectangle",
"pos": {
- "x": 1637,
- "y": 1261
+ "x": 1290,
+ "y": 434
},
"width": 173,
- "height": 118,
+ "height": 92,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -921,56 +760,15 @@
"zIndex": 0,
"level": 2
},
- {
- "id": "jita.rows",
- "type": "rectangle",
- "pos": {
- "x": 2698,
- "y": 912
- },
- "width": 52,
- "height": 66,
- "opacity": 1,
- "strokeDash": 0,
- "strokeWidth": 2,
- "borderRadius": 0,
- "fill": "B5",
- "stroke": "B1",
- "shadow": false,
- "3d": false,
- "multiple": false,
- "double-border": false,
- "tooltip": "",
- "link": "",
- "icon": null,
- "iconPosition": "",
- "blend": false,
- "fields": null,
- "methods": null,
- "columns": null,
- "label": "1",
- "fontSize": 16,
- "fontFamily": "DEFAULT",
- "language": "",
- "color": "N1",
- "italic": false,
- "bold": true,
- "underline": false,
- "labelWidth": 7,
- "labelHeight": 21,
- "labelPosition": "INSIDE_MIDDLE_CENTER",
- "zIndex": 0,
- "level": 2
- },
{
"id": "jita.Slack",
"type": "rectangle",
"pos": {
- "x": 2669,
- "y": 998
+ "x": 2196,
+ "y": 60
},
"width": 110,
- "height": 118,
+ "height": 92,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -1019,8 +817,8 @@
"id": "jita.Mattermost",
"type": "rectangle",
"pos": {
- "x": 2660,
- "y": 1136
+ "x": 2346,
+ "y": 60
},
"width": 128,
"height": 66,
@@ -1060,8 +858,8 @@
"id": "jita.Jira",
"type": "rectangle",
"pos": {
- "x": 2688,
- "y": 1222
+ "x": 2514,
+ "y": 60
},
"width": 72,
"height": 66,
@@ -1101,8 +899,8 @@
"id": "jita.Pagerduty",
"type": "rectangle",
"pos": {
- "x": 2664,
- "y": 1308
+ "x": 2626,
+ "y": 60
},
"width": 119,
"height": 66,
@@ -1142,11 +940,11 @@
"id": "jita.Email",
"type": "rectangle",
"pos": {
- "x": 2668,
- "y": 1394
+ "x": 2785,
+ "y": 60
},
"width": 111,
- "height": 118,
+ "height": 92,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -1191,56 +989,15 @@
"zIndex": 0,
"level": 2
},
- {
- "id": "infra.rows",
- "type": "rectangle",
- "pos": {
- "x": 2697,
- "y": 1702
- },
- "width": 53,
- "height": 66,
- "opacity": 1,
- "strokeDash": 0,
- "strokeWidth": 2,
- "borderRadius": 0,
- "fill": "B5",
- "stroke": "B1",
- "shadow": false,
- "3d": false,
- "multiple": false,
- "double-border": false,
- "tooltip": "",
- "link": "",
- "icon": null,
- "iconPosition": "",
- "blend": false,
- "fields": null,
- "methods": null,
- "columns": null,
- "label": "2",
- "fontSize": 16,
- "fontFamily": "DEFAULT",
- "language": "",
- "color": "N1",
- "italic": false,
- "bold": true,
- "underline": false,
- "labelWidth": 8,
- "labelHeight": 21,
- "labelPosition": "INSIDE_MIDDLE_CENTER",
- "zIndex": 0,
- "level": 2
- },
{
"id": "infra.ssh",
"type": "rectangle",
"pos": {
- "x": 2676,
- "y": 1788
+ "x": 2315,
+ "y": 292
},
"width": 95,
- "height": 118,
+ "height": 92,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -1289,11 +1046,11 @@
"id": "infra.Kubernetes",
"type": "rectangle",
"pos": {
- "x": 2648,
- "y": 1926
+ "x": 2450,
+ "y": 292
},
"width": 152,
- "height": 118,
+ "height": 92,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -1342,11 +1099,11 @@
"id": "infra.My SQL",
"type": "rectangle",
"pos": {
- "x": 2663,
- "y": 2064
+ "x": 2642,
+ "y": 292
},
"width": 122,
- "height": 118,
+ "height": 92,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -1395,11 +1152,11 @@
"id": "infra.MongoDB",
"type": "rectangle",
"pos": {
- "x": 2655,
- "y": 2202
+ "x": 2315,
+ "y": 424
},
"width": 138,
- "height": 118,
+ "height": 92,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -1448,11 +1205,11 @@
"id": "infra.PSQL",
"type": "rectangle",
"pos": {
- "x": 2670,
- "y": 2340
+ "x": 2493,
+ "y": 424
},
"width": 108,
- "height": 118,
+ "height": 92,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -1501,11 +1258,11 @@
"id": "infra.Windows",
"type": "rectangle",
"pos": {
- "x": 2656,
- "y": 2478
+ "x": 2641,
+ "y": 424
},
"width": 136,
- "height": 118,
+ "height": 92,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -1579,20 +1336,20 @@
"labelPercentage": 0,
"route": [
{
- "x": 423,
- "y": 412
+ "x": 272,
+ "y": 434.5
},
{
- "x": 531.4,
- "y": 412
+ "x": 380.4,
+ "y": 434.5
},
{
- "x": 585.7,
- "y": 412
+ "x": 434.7,
+ "y": 434.5
},
{
- "x": 694.5,
- "y": 412
+ "x": 543.5,
+ "y": 434.5
}
],
"isCurve": true,
@@ -1628,20 +1385,20 @@
"labelPercentage": 0,
"route": [
{
- "x": 1166,
- "y": 842
+ "x": 779,
+ "y": 434.5
},
{
- "x": 1274.4,
- "y": 842
+ "x": 887.4,
+ "y": 434.5
},
{
- "x": 1328.7,
- "y": 842
+ "x": 941.7,
+ "y": 434.5
},
{
- "x": 1437.5,
- "y": 842
+ "x": 1050.5,
+ "y": 434.5
}
],
"isCurve": true,
@@ -1677,20 +1434,20 @@
"labelPercentage": 0,
"route": [
{
- "x": 2010,
- "y": 924.75
+ "x": 1592.4246575342465,
+ "y": 283
},
{
- "x": 2210.8,
- "y": 924.75
+ "x": 1826.4849315068493,
+ "y": 141.4
},
{
- "x": 2311.2,
- "y": 924.75
+ "x": 1935.2,
+ "y": 106
},
{
- "x": 2512,
- "y": 924.75
+ "x": 2136,
+ "y": 106
}
],
"isCurve": true,
@@ -1726,20 +1483,20 @@
"labelPercentage": 0,
"route": [
{
- "x": 2010,
- "y": 1715.25
+ "x": 1634,
+ "y": 418.0985267034991
},
{
- "x": 2210.8,
- "y": 1715.25
+ "x": 1834.8,
+ "y": 406.81970534069984
},
{
- "x": 2311.2,
- "y": 1715.25
+ "x": 1959,
+ "y": 404
},
{
- "x": 2512,
- "y": 1715.25
+ "x": 2255,
+ "y": 404
}
],
"isCurve": true,
@@ -1775,20 +1532,20 @@
"labelPercentage": 0,
"route": [
{
- "x": 1437,
- "y": 1715.25
+ "x": 1634,
+ "y": 501.98802946593
},
{
- "x": 1328.6,
- "y": 1715.25
+ "x": 1834.8,
+ "y": 548.397605893186
},
{
- "x": 1125.8,
- "y": 1648.05
+ "x": 1997.1,
+ "y": 576.1111951588503
},
{
- "x": 965,
- "y": 1379.25
+ "x": 2445.5,
+ "y": 640.5559757942511
}
],
"isCurve": true,
@@ -1824,20 +1581,20 @@
"labelPercentage": 0,
"route": [
{
- "x": 1437,
- "y": 1148.25
+ "x": 1634,
+ "y": 569.47605893186
},
{
- "x": 1328.6,
- "y": 1148.25
+ "x": 1834.8,
+ "y": 662.295211786372
},
{
- "x": 1135,
- "y": 1170.85
+ "x": 1997.1,
+ "y": 680.3274583963691
},
{
- "x": 1011,
- "y": 1261.25
+ "x": 2445.5,
+ "y": 659.6372919818457
}
],
"isCurve": true,
diff --git a/e2etests/testdata/stable/teleport_grid/dagre/sketch.exp.svg b/e2etests/testdata/stable/teleport_grid/dagre/sketch.exp.svg
index bcc5d18eda..1c0f9f7750 100644
--- a/e2etests/testdata/stable/teleport_grid/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/teleport_grid/dagre/sketch.exp.svg
@@ -1,24 +1,24 @@
-users via Just-in-time Access via Infrastructure Indentity Provider 2 Engineers Machines 1 HTTPS:// > kubectl > tsh > api DB Clients 2 2
Teleport
-
Identity Native Proxy
-Audit Log Cert Authority 1 Slack Mattermost Jira Email 2 ssh Kubernetes My SQL MongoDB PSQL Windows all connections audited and logged
-
-
+users via Just-in-time Access via Infrastructure Indentity Provider Engineers Machines HTTPS:// > kubectl > tsh > api DB Clients
Teleport
+
Identity Native Proxy
+Audit Log Cert Authority Slack Mattermost Jira Email ssh Kubernetes My SQL MongoDB PSQL Windows all connections audited and logged
+
+
\ No newline at end of file
diff --git a/e2etests/testdata/stable/teleport_grid/elk/board.exp.json b/e2etests/testdata/stable/teleport_grid/elk/board.exp.json
index 3059995019..ddcd095d66 100644
--- a/e2etests/testdata/stable/teleport_grid/elk/board.exp.json
+++ b/e2etests/testdata/stable/teleport_grid/elk/board.exp.json
@@ -8,10 +8,10 @@
"type": "rectangle",
"pos": {
"x": 12,
- "y": 842
+ "y": 196
},
- "width": 252,
- "height": 559,
+ "width": 272,
+ "height": 461,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -48,11 +48,11 @@
"id": "via",
"type": "rectangle",
"pos": {
- "x": 334,
- "y": 823
+ "x": 354,
+ "y": 122
},
- "width": 216,
- "height": 596,
+ "width": 236,
+ "height": 610,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -89,11 +89,11 @@
"id": "teleport",
"type": "rectangle",
"pos": {
- "x": 620,
- "y": 786
+ "x": 660,
+ "y": 275
},
- "width": 402,
- "height": 670,
+ "width": 584,
+ "height": 303,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -122,6 +122,7 @@
"underline": false,
"labelWidth": 0,
"labelHeight": 0,
+ "labelPosition": "INSIDE_TOP_CENTER",
"zIndex": 0,
"level": 1
},
@@ -129,11 +130,11 @@
"id": "jita",
"type": "rectangle",
"pos": {
- "x": 1474,
+ "x": 2026,
"y": 12
},
- "width": 311,
- "height": 700,
+ "width": 820,
+ "height": 212,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -170,11 +171,11 @@
"id": "infra",
"type": "rectangle",
"pos": {
- "x": 1152,
- "y": 394
+ "x": 1374,
+ "y": 150
},
- "width": 252,
- "height": 994,
+ "width": 582,
+ "height": 344,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -211,8 +212,8 @@
"id": "identity provider",
"type": "rectangle",
"pos": {
- "x": 1152,
- "y": 1408
+ "x": 1374,
+ "y": 514
},
"width": 201,
"height": 118,
@@ -260,56 +261,15 @@
"zIndex": 0,
"level": 1
},
- {
- "id": "users.rows",
- "type": "rectangle",
- "pos": {
- "x": 111,
- "y": 892
- },
- "width": 53,
- "height": 66,
- "opacity": 1,
- "strokeDash": 0,
- "strokeWidth": 2,
- "borderRadius": 0,
- "fill": "B5",
- "stroke": "B1",
- "shadow": false,
- "3d": false,
- "multiple": false,
- "double-border": false,
- "tooltip": "",
- "link": "",
- "icon": null,
- "iconPosition": "",
- "blend": false,
- "fields": null,
- "methods": null,
- "columns": null,
- "label": "2",
- "fontSize": 16,
- "fontFamily": "DEFAULT",
- "language": "",
- "color": "N1",
- "italic": false,
- "bold": true,
- "underline": false,
- "labelWidth": 8,
- "labelHeight": 21,
- "labelPosition": "INSIDE_MIDDLE_CENTER",
- "zIndex": 0,
- "level": 2
- },
{
"id": "users.Engineers",
"type": "oval",
"pos": {
- "x": 62,
- "y": 978
+ "x": 72,
+ "y": 256
},
"width": 152,
- "height": 178,
+ "height": 152,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -358,11 +318,11 @@
"id": "users.Machines",
"type": "oval",
"pos": {
- "x": 63,
- "y": 1176
+ "x": 72,
+ "y": 448
},
"width": 149,
- "height": 175,
+ "height": 149,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -407,53 +367,12 @@
"zIndex": 0,
"level": 2
},
- {
- "id": "via.columns",
- "type": "rectangle",
- "pos": {
- "x": 416,
- "y": 873
- },
- "width": 52,
- "height": 66,
- "opacity": 1,
- "strokeDash": 0,
- "strokeWidth": 2,
- "borderRadius": 0,
- "fill": "B5",
- "stroke": "B1",
- "shadow": false,
- "3d": false,
- "multiple": false,
- "double-border": false,
- "tooltip": "",
- "link": "",
- "icon": null,
- "iconPosition": "",
- "blend": false,
- "fields": null,
- "methods": null,
- "columns": null,
- "label": "1",
- "fontSize": 16,
- "fontFamily": "DEFAULT",
- "language": "",
- "color": "N1",
- "italic": false,
- "bold": true,
- "underline": false,
- "labelWidth": 7,
- "labelHeight": 21,
- "labelPosition": "INSIDE_MIDDLE_CENTER",
- "zIndex": 0,
- "level": 2
- },
{
"id": "via.https",
"type": "rectangle",
"pos": {
- "x": 388,
- "y": 959
+ "x": 414,
+ "y": 182
},
"width": 107,
"height": 66,
@@ -493,8 +412,8 @@
"id": "via.kubectl",
"type": "rectangle",
"pos": {
- "x": 386,
- "y": 1045
+ "x": 414,
+ "y": 288
},
"width": 111,
"height": 66,
@@ -534,8 +453,8 @@
"id": "via.tsh",
"type": "rectangle",
"pos": {
- "x": 402,
- "y": 1131
+ "x": 414,
+ "y": 394
},
"width": 79,
"height": 66,
@@ -575,8 +494,8 @@
"id": "via.api",
"type": "rectangle",
"pos": {
- "x": 402,
- "y": 1217
+ "x": 414,
+ "y": 500
},
"width": 79,
"height": 66,
@@ -616,8 +535,8 @@
"id": "via.db clients",
"type": "rectangle",
"pos": {
- "x": 384,
- "y": 1303
+ "x": 414,
+ "y": 606
},
"width": 116,
"height": 66,
@@ -653,94 +572,12 @@
"zIndex": 0,
"level": 2
},
- {
- "id": "teleport.rows",
- "type": "rectangle",
- "pos": {
- "x": 794,
- "y": 836
- },
- "width": 53,
- "height": 66,
- "opacity": 1,
- "strokeDash": 0,
- "strokeWidth": 2,
- "borderRadius": 0,
- "fill": "B5",
- "stroke": "B1",
- "shadow": false,
- "3d": false,
- "multiple": false,
- "double-border": false,
- "tooltip": "",
- "link": "",
- "icon": null,
- "iconPosition": "",
- "blend": false,
- "fields": null,
- "methods": null,
- "columns": null,
- "label": "2",
- "fontSize": 16,
- "fontFamily": "DEFAULT",
- "language": "",
- "color": "N1",
- "italic": false,
- "bold": true,
- "underline": false,
- "labelWidth": 8,
- "labelHeight": 21,
- "labelPosition": "INSIDE_MIDDLE_CENTER",
- "zIndex": 0,
- "level": 2
- },
- {
- "id": "teleport.columns",
- "type": "rectangle",
- "pos": {
- "x": 794,
- "y": 922
- },
- "width": 53,
- "height": 66,
- "opacity": 1,
- "strokeDash": 0,
- "strokeWidth": 2,
- "borderRadius": 0,
- "fill": "B5",
- "stroke": "B1",
- "shadow": false,
- "3d": false,
- "multiple": false,
- "double-border": false,
- "tooltip": "",
- "link": "",
- "icon": null,
- "iconPosition": "",
- "blend": false,
- "fields": null,
- "methods": null,
- "columns": null,
- "label": "2",
- "fontSize": 16,
- "fontFamily": "DEFAULT",
- "language": "",
- "color": "N1",
- "italic": false,
- "bold": true,
- "underline": false,
- "labelWidth": 8,
- "labelHeight": 21,
- "labelPosition": "INSIDE_MIDDLE_CENTER",
- "zIndex": 0,
- "level": 2
- },
{
"id": "teleport.t",
"type": "text",
"pos": {
- "x": 760,
- "y": 1008
+ "x": 720,
+ "y": 335
},
"width": 122,
"height": 51,
@@ -772,6 +609,7 @@
"underline": false,
"labelWidth": 122,
"labelHeight": 51,
+ "labelPosition": "INSIDE_MIDDLE_CENTER",
"zIndex": 0,
"level": 2
},
@@ -779,8 +617,8 @@
"id": "teleport.inp",
"type": "text",
"pos": {
- "x": 670,
- "y": 1079
+ "x": 882,
+ "y": 335
},
"width": 302,
"height": 51,
@@ -812,6 +650,7 @@
"underline": false,
"labelWidth": 302,
"labelHeight": 51,
+ "labelPosition": "INSIDE_MIDDLE_CENTER",
"zIndex": 0,
"level": 2
},
@@ -819,11 +658,11 @@
"id": "teleport.Audit Log",
"type": "rectangle",
"pos": {
- "x": 751,
- "y": 1150
+ "x": 720,
+ "y": 426
},
"width": 140,
- "height": 118,
+ "height": 92,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -872,11 +711,11 @@
"id": "teleport.Cert Authority",
"type": "rectangle",
"pos": {
- "x": 734,
- "y": 1288
+ "x": 900,
+ "y": 426
},
"width": 173,
- "height": 118,
+ "height": 92,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -921,56 +760,15 @@
"zIndex": 0,
"level": 2
},
- {
- "id": "jita.rows",
- "type": "rectangle",
- "pos": {
- "x": 1603,
- "y": 62
- },
- "width": 52,
- "height": 66,
- "opacity": 1,
- "strokeDash": 0,
- "strokeWidth": 2,
- "borderRadius": 0,
- "fill": "B5",
- "stroke": "B1",
- "shadow": false,
- "3d": false,
- "multiple": false,
- "double-border": false,
- "tooltip": "",
- "link": "",
- "icon": null,
- "iconPosition": "",
- "blend": false,
- "fields": null,
- "methods": null,
- "columns": null,
- "label": "1",
- "fontSize": 16,
- "fontFamily": "DEFAULT",
- "language": "",
- "color": "N1",
- "italic": false,
- "bold": true,
- "underline": false,
- "labelWidth": 7,
- "labelHeight": 21,
- "labelPosition": "INSIDE_MIDDLE_CENTER",
- "zIndex": 0,
- "level": 2
- },
{
"id": "jita.Slack",
"type": "rectangle",
"pos": {
- "x": 1574,
- "y": 148
+ "x": 2086,
+ "y": 72
},
"width": 110,
- "height": 118,
+ "height": 92,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -1019,8 +817,8 @@
"id": "jita.Mattermost",
"type": "rectangle",
"pos": {
- "x": 1565,
- "y": 286
+ "x": 2236,
+ "y": 72
},
"width": 128,
"height": 66,
@@ -1060,8 +858,8 @@
"id": "jita.Jira",
"type": "rectangle",
"pos": {
- "x": 1593,
- "y": 372
+ "x": 2404,
+ "y": 72
},
"width": 72,
"height": 66,
@@ -1101,8 +899,8 @@
"id": "jita.Pagerduty",
"type": "rectangle",
"pos": {
- "x": 1570,
- "y": 458
+ "x": 2516,
+ "y": 72
},
"width": 119,
"height": 66,
@@ -1142,11 +940,11 @@
"id": "jita.Email",
"type": "rectangle",
"pos": {
- "x": 1574,
- "y": 544
+ "x": 2675,
+ "y": 72
},
"width": 111,
- "height": 118,
+ "height": 92,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -1191,56 +989,15 @@
"zIndex": 0,
"level": 2
},
- {
- "id": "infra.rows",
- "type": "rectangle",
- "pos": {
- "x": 1251,
- "y": 444
- },
- "width": 53,
- "height": 66,
- "opacity": 1,
- "strokeDash": 0,
- "strokeWidth": 2,
- "borderRadius": 0,
- "fill": "B5",
- "stroke": "B1",
- "shadow": false,
- "3d": false,
- "multiple": false,
- "double-border": false,
- "tooltip": "",
- "link": "",
- "icon": null,
- "iconPosition": "",
- "blend": false,
- "fields": null,
- "methods": null,
- "columns": null,
- "label": "2",
- "fontSize": 16,
- "fontFamily": "DEFAULT",
- "language": "",
- "color": "N1",
- "italic": false,
- "bold": true,
- "underline": false,
- "labelWidth": 8,
- "labelHeight": 21,
- "labelPosition": "INSIDE_MIDDLE_CENTER",
- "zIndex": 0,
- "level": 2
- },
{
"id": "infra.ssh",
"type": "rectangle",
"pos": {
- "x": 1230,
- "y": 530
+ "x": 1434,
+ "y": 210
},
"width": 95,
- "height": 118,
+ "height": 92,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -1289,11 +1046,11 @@
"id": "infra.Kubernetes",
"type": "rectangle",
"pos": {
- "x": 1202,
- "y": 668
+ "x": 1569,
+ "y": 210
},
"width": 152,
- "height": 118,
+ "height": 92,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -1342,11 +1099,11 @@
"id": "infra.My SQL",
"type": "rectangle",
"pos": {
- "x": 1217,
- "y": 806
+ "x": 1761,
+ "y": 210
},
"width": 122,
- "height": 118,
+ "height": 92,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -1395,11 +1152,11 @@
"id": "infra.MongoDB",
"type": "rectangle",
"pos": {
- "x": 1209,
- "y": 944
+ "x": 1434,
+ "y": 342
},
"width": 138,
- "height": 118,
+ "height": 92,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -1448,11 +1205,11 @@
"id": "infra.PSQL",
"type": "rectangle",
"pos": {
- "x": 1224,
- "y": 1082
+ "x": 1612,
+ "y": 342
},
"width": 108,
- "height": 118,
+ "height": 92,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -1501,11 +1258,11 @@
"id": "infra.Windows",
"type": "rectangle",
"pos": {
- "x": 1210,
- "y": 1220
+ "x": 1760,
+ "y": 342
},
"width": 136,
- "height": 118,
+ "height": 92,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -1579,12 +1336,12 @@
"labelPercentage": 0,
"route": [
{
- "x": 264,
- "y": 1121.8333333333333
+ "x": 284,
+ "y": 427.0333333333333
},
{
- "x": 334,
- "y": 1121.8333333333333
+ "x": 354,
+ "y": 427.0333333333333
}
],
"animated": false,
@@ -1619,12 +1376,12 @@
"labelPercentage": 0,
"route": [
{
- "x": 550,
- "y": 1121.8333333333333
+ "x": 590,
+ "y": 427.0333333333333
},
{
- "x": 620,
- "y": 1121.8333333333333
+ "x": 660,
+ "y": 427.0333333333333
}
],
"animated": false,
@@ -1659,20 +1416,20 @@
"labelPercentage": 0,
"route": [
{
- "x": 1022,
- "y": 920.8333333333333
+ "x": 1244,
+ "y": 336.1333333333333
},
{
- "x": 1062,
- "y": 920.8333333333333
+ "x": 1284,
+ "y": 336.1333333333333
},
{
- "x": 1062,
- "y": 362
+ "x": 1284,
+ "y": 118
},
{
- "x": 1474,
- "y": 362
+ "x": 2026,
+ "y": 118
}
],
"animated": false,
@@ -1707,12 +1464,12 @@
"labelPercentage": 0,
"route": [
{
- "x": 1022,
- "y": 1054.8333333333333
+ "x": 1244,
+ "y": 396.7333333333333
},
{
- "x": 1152,
- "y": 1054.8333333333333
+ "x": 1374,
+ "y": 396.7333333333333
}
],
"animated": false,
@@ -1747,20 +1504,20 @@
"labelPercentage": 0,
"route": [
{
- "x": 1022,
- "y": 1188.8333333333333
+ "x": 1244,
+ "y": 457.3333333333333
},
{
- "x": 1112,
- "y": 1188.8333333333333
+ "x": 1334,
+ "y": 457.3333333333333
},
{
- "x": 1112,
- "y": 1447.3333333333333
+ "x": 1334,
+ "y": 553.3333333333333
},
{
- "x": 1152,
- "y": 1447.3333333333333
+ "x": 1374,
+ "y": 553.3333333333333
}
],
"animated": false,
@@ -1795,20 +1552,20 @@
"labelPercentage": 0,
"route": [
{
- "x": 1022,
- "y": 1322.8333333333333
+ "x": 1244,
+ "y": 517.9333333333333
},
{
- "x": 1062,
- "y": 1322.8333333333333
+ "x": 1284,
+ "y": 517.9333333333333
},
{
- "x": 1062,
- "y": 1486.6666666666667
+ "x": 1284,
+ "y": 592.6666666666666
},
{
- "x": 1152,
- "y": 1486.6666666666667
+ "x": 1374,
+ "y": 592.6666666666666
}
],
"animated": false,
diff --git a/e2etests/testdata/stable/teleport_grid/elk/sketch.exp.svg b/e2etests/testdata/stable/teleport_grid/elk/sketch.exp.svg
index 7bade43c9f..d951206d67 100644
--- a/e2etests/testdata/stable/teleport_grid/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/teleport_grid/elk/sketch.exp.svg
@@ -1,24 +1,24 @@
-users via Just-in-time Access via Infrastructure Indentity Provider 2 Engineers Machines 1 HTTPS:// > kubectl > tsh > api DB Clients 2 2
Teleport
-
Identity Native Proxy
-Audit Log Cert Authority 1 Slack Mattermost Jira Email 2 ssh Kubernetes My SQL MongoDB PSQL Windows all connections audited and logged
-
-
+users via Just-in-time Access via Infrastructure Indentity Provider Engineers Machines HTTPS:// > kubectl > tsh > api DB Clients
Teleport
+
Identity Native Proxy
+Audit Log Cert Authority Slack Mattermost Jira Email ssh Kubernetes My SQL MongoDB PSQL Windows all connections audited and logged
+
+
\ No newline at end of file