Skip to content

Commit 14a9d6f

Browse files
committed
get in line
1 parent a3d076e commit 14a9d6f

File tree

4 files changed

+42
-11
lines changed

4 files changed

+42
-11
lines changed

packages/proxysg/data_stream/log/_dev/test/pipeline/test-proxy-bcreportermainv1.log-expected.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
"ip": "10.0.1.2"
3232
},
3333
"client_to_server": {
34+
"bytes": "111",
3435
"categories": "Web Infrastructure",
3536
"host": "www.msftconnecttest.com",
3637
"method": "GET",
@@ -53,6 +54,7 @@
5354
"supplier_country": "None"
5455
},
5556
"server_to_client": {
57+
"bytes": "1033",
5658
"filter_result": "DENIED",
5759
"status": "302"
5860
},
@@ -120,6 +122,7 @@
120122
"ip": "10.0.1.2"
121123
},
122124
"client_to_server": {
125+
"bytes": "582",
123126
"categories": "Chat (IM)/SMS;Social Networking",
124127
"host": "tr6.snapchat.com",
125128
"method": "OPTIONS",
@@ -136,6 +139,7 @@
136139
"supplier_country": "None"
137140
},
138141
"server_to_client": {
142+
"bytes": "1297",
139143
"filter_result": "DENIED",
140144
"status": "401"
141145
},
@@ -207,6 +211,7 @@
207211
"ip": "10.0.1.2"
208212
},
209213
"client_to_server": {
214+
"bytes": "291",
210215
"categories": "Web Infrastructure",
211216
"host": "ctldl.windowsupdate.com",
212217
"method": "GET",
@@ -224,6 +229,7 @@
224229
"supplier_country": "None"
225230
},
226231
"server_to_client": {
232+
"bytes": "1297",
227233
"filter_result": "DENIED",
228234
"status": "401"
229235
},
@@ -291,6 +297,7 @@
291297
"ip": "10.0.1.2"
292298
},
293299
"client_to_server": {
300+
"bytes": "111",
294301
"categories": "Web Infrastructure",
295302
"host": "www.msftconnecttest.com",
296303
"method": "GET",
@@ -307,6 +314,7 @@
307314
"supplier_country": "None"
308315
},
309316
"server_to_client": {
317+
"bytes": "1033",
310318
"filter_result": "DENIED",
311319
"status": "302"
312320
},
@@ -373,6 +381,7 @@
373381
"ip": "10.0.1.2"
374382
},
375383
"client_to_server": {
384+
"bytes": "510",
376385
"categories": "Web Ads/Analytics",
377386
"host": "dt.adsafeprotected.com",
378387
"method": "OPTIONS",
@@ -390,6 +399,7 @@
390399
"supplier_country": "None"
391400
},
392401
"server_to_client": {
402+
"bytes": "1316",
393403
"filter_result": "DENIED",
394404
"status": "401"
395405
},

packages/proxysg/data_stream/log/_dev/test/pipeline/test-proxy-bcreportersslv1.log-expected.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
"ip": "10.0.1.1"
3232
},
3333
"client_to_server": {
34+
"bytes": "11343",
3435
"categories": "Web Ads/Analytics",
3536
"host": "server.googleapis.com",
3637
"method": "POST",
@@ -52,6 +53,7 @@
5253
"supplier_country": "None"
5354
},
5455
"server_to_client": {
56+
"bytes": "1039",
5557
"filter_result": "DENIED",
5658
"status": "307"
5759
},
@@ -119,6 +121,7 @@
119121
"ip": "10.0.1.1"
120122
},
121123
"client_to_server": {
124+
"bytes": "720",
122125
"categories": "Web Ads/Analytics",
123126
"host": "px.moatads.com",
124127
"method": "GET",
@@ -142,6 +145,7 @@
142145
"supplier_country": "None"
143146
},
144147
"server_to_client": {
148+
"bytes": "1231",
145149
"filter_result": "DENIED",
146150
"status": "307"
147151
},
@@ -206,6 +210,7 @@
206210
"ip": "10.0.1.1"
207211
},
208212
"client_to_server": {
213+
"bytes": "7791",
209214
"categories": "Web Ads/Analytics",
210215
"host": "t.txt.com",
211216
"method": "POST",
@@ -227,6 +232,7 @@
227232
"supplier_country": "None"
228233
},
229234
"server_to_client": {
235+
"bytes": "1167",
230236
"filter_result": "DENIED",
231237
"status": "307"
232238
},
@@ -294,6 +300,7 @@
294300
"ip": "10.0.1.1"
295301
},
296302
"client_to_server": {
303+
"bytes": "3174",
297304
"categories": "Sports/Recreation",
298305
"host": "secure.espn.com",
299306
"method": "unknown",
@@ -317,6 +324,7 @@
317324
"supplier_name": "secure.espn.com"
318325
},
319326
"server_to_client": {
327+
"bytes": "42796",
320328
"filter_result": "OBSERVED",
321329
"status": "0"
322330
},
@@ -367,6 +375,7 @@
367375
"ip": "10.0.1.1"
368376
},
369377
"client_to_server": {
378+
"bytes": "764",
370379
"categories": "Technology/Internet",
371380
"host": "edge.microsoft.com",
372381
"method": "GET",
@@ -388,6 +397,7 @@
388397
"supplier_country": "None"
389398
},
390399
"server_to_client": {
400+
"bytes": "1323",
391401
"filter_result": "DENIED",
392402
"status": "307"
393403
},

packages/proxysg/data_stream/log/_dev/test/pipeline/test-proxy-main.log-expected.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"ip": "10.82.255.36"
3636
},
3737
"client_to_server": {
38+
"bytes": "969",
3839
"categories": "FastwebRes_CallCntr;Web Ads/Analytics",
3940
"host": "pixel.tapad.com",
4041
"method": "GET",
@@ -52,6 +53,7 @@
5253
"supplier_name": "pixel.tapad.com"
5354
},
5455
"server_to_client": {
56+
"bytes": "1242",
5557
"filter_result": "OBSERVED",
5658
"status": "302"
5759
},
@@ -133,6 +135,7 @@
133135
"ip": "10.82.255.36"
134136
},
135137
"client_to_server": {
138+
"bytes": "1360",
136139
"categories": "FastwebRes_CallCntr;Web Ads/Analytics",
137140
"host": "p.rfihub.com",
138141
"method": "GET",
@@ -149,6 +152,7 @@
149152
"supplier_name": "p.rfihub.com"
150153
},
151154
"server_to_client": {
155+
"bytes": "1158",
152156
"filter_result": "OBSERVED",
153157
"status": "302"
154158
},
@@ -216,6 +220,7 @@
216220
"ip": "10.82.255.36"
217221
},
218222
"client_to_server": {
223+
"bytes": "356",
219224
"categories": "FastwebRes_CallCntr;Web Ads/Analytics",
220225
"host": "token.rubiconproject.com",
221226
"method": "CONNECT",
@@ -229,6 +234,7 @@
229234
"ip": "81.2.69.144"
230235
},
231236
"server_to_client": {
237+
"bytes": "39",
232238
"filter_result": "OBSERVED",
233239
"status": "200"
234240
},
@@ -295,6 +301,7 @@
295301
"ip": "10.82.255.36"
296302
},
297303
"client_to_server": {
304+
"bytes": "5784",
298305
"categories": "Web Ads/Analytics",
299306
"host": "rtb-csync.smartadserver.com",
300307
"method": "unknown",
@@ -309,6 +316,7 @@
309316
"supplier_name": "rtb-csync.smartadserver.com"
310317
},
311318
"server_to_client": {
319+
"bytes": "4897",
312320
"filter_result": "OBSERVED",
313321
"status": "0"
314322
},
@@ -375,6 +383,7 @@
375383
"ip": "10.82.255.36"
376384
},
377385
"client_to_server": {
386+
"bytes": "334",
378387
"categories": "Technology/Internet",
379388
"host": "a.vidoomy.com",
380389
"method": "CONNECT",
@@ -388,6 +397,7 @@
388397
"ip": "81.2.69.144"
389398
},
390399
"server_to_client": {
400+
"bytes": "39",
391401
"filter_result": "OBSERVED",
392402
"status": "200"
393403
},
@@ -454,6 +464,7 @@
454464
"ip": "10.82.255.36"
455465
},
456466
"client_to_server": {
467+
"bytes": "348",
457468
"categories": "FastwebRes_CallCntr;Web Ads/Analytics",
458469
"host": "pixel.quantserve.com",
459470
"method": "CONNECT",
@@ -467,6 +478,7 @@
467478
"ip": "81.2.69.144"
468479
},
469480
"server_to_client": {
481+
"bytes": "39",
470482
"filter_result": "OBSERVED",
471483
"status": "200"
472484
},
@@ -534,6 +546,7 @@
534546
"ip": "10.82.255.36"
535547
},
536548
"client_to_server": {
549+
"bytes": "809",
537550
"categories": "Web Ads/Analytics",
538551
"host": "x.bidswitch.net",
539552
"method": "GET",
@@ -550,6 +563,7 @@
550563
"supplier_name": "x.bidswitch.net"
551564
},
552565
"server_to_client": {
566+
"bytes": "298",
553567
"filter_result": "OBSERVED",
554568
"status": "302"
555569
},
@@ -618,6 +632,7 @@
618632
"ip": "10.82.255.36"
619633
},
620634
"client_to_server": {
635+
"bytes": "893",
621636
"categories": "FastwebRes_CallCntr;Web Ads/Analytics",
622637
"host": "token.rubiconproject.com",
623638
"method": "GET",
@@ -637,6 +652,7 @@
637652
"supplier_name": "token.rubiconproject.com"
638653
},
639654
"server_to_client": {
655+
"bytes": "947",
640656
"filter_result": "OBSERVED",
641657
"status": "200"
642658
},
@@ -705,6 +721,7 @@
705721
"ip": "10.82.255.36"
706722
},
707723
"client_to_server": {
724+
"bytes": "546",
708725
"categories": "FastwebRes_CallCntr;Web Ads/Analytics",
709726
"host": "rules.quantcount.com",
710727
"method": "GET",
@@ -723,6 +740,7 @@
723740
"supplier_name": "rules.quantcount.com"
724741
},
725742
"server_to_client": {
743+
"bytes": "4569",
726744
"filter_result": "OBSERVED",
727745
"status": "200"
728746
},
@@ -790,6 +808,7 @@
790808
"ip": "10.82.255.36"
791809
},
792810
"client_to_server": {
811+
"bytes": "702",
793812
"categories": "FastwebRes_CallCntr;Web Ads/Analytics",
794813
"host": "aax-eu.amazon-adsystem.com",
795814
"method": "GET",
@@ -809,6 +828,7 @@
809828
"supplier_name": "aax-eu.amazon-adsystem.com"
810829
},
811830
"server_to_client": {
831+
"bytes": "855",
812832
"filter_result": "OBSERVED",
813833
"status": "200"
814834
},
@@ -877,6 +897,7 @@
877897
"ip": "10.82.255.36"
878898
},
879899
"client_to_server": {
900+
"bytes": "775",
880901
"categories": "Web Ads/Analytics",
881902
"host": "x.bidswitch.net",
882903
"method": "GET",
@@ -894,6 +915,7 @@
894915
"supplier_name": "x.bidswitch.net"
895916
},
896917
"server_to_client": {
918+
"bytes": "541",
897919
"filter_result": "OBSERVED",
898920
"status": "302"
899921
},

packages/proxysg/data_stream/log/elasticsearch/ingest_pipeline/default.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -107,17 +107,6 @@ processors:
107107
type: long
108108
ignore_missing: true
109109

110-
111-
- remove:
112-
tag: proxysg_remove_original_server_to_client_bytes
113-
field: proxysg.server_to_client.bytes
114-
ignore_missing: true
115-
116-
- remove:
117-
tag: proxysg_remove_original_client_to_server_bytes
118-
field: proxysg.client_to_server.bytes
119-
ignore_missing: true
120-
121110
# ECS mappings
122111
- set:
123112
tag: set_client_ip_2339ed7a

0 commit comments

Comments
 (0)