Skip to content

Commit f2dc749

Browse files
r00tu53rr00tu53r
committed
Upgrade ECS to 8.0.0
1 parent 2aa502e commit f2dc749

File tree

9 files changed

+140
-145
lines changed

9 files changed

+140
-145
lines changed

‎packages/cassandra/_dev/build/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
dependencies:
22
ecs:
3-
reference: git@1.12
3+
reference: git@8.0

‎packages/cassandra/changelog.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
- version: "1.2.0"
2+
changes:
3+
- description: Update to ECS 8.0
4+
type: enhancement
5+
link: https://github.com/elastic/integrations/pull/2483
16
- version: "1.1.0"
27
changes:
38
- description: Release cassandra package for v8.0.0

‎packages/cassandra/data_stream/log/_dev/test/pipeline/test-cassandra.log-expected.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
},
99
"@timestamp": "2021-07-21T12:18:15.910Z",
1010
"ecs": {
11-
"version": "1.12.0"
11+
"version": "8.0.0"
1212
},
1313
"log": {
1414
"level": "INFO",
1515
"origin": {
1616
"file": {
1717
"name": "YamlConfigurationLoader.java",
18-
"line": "92"
18+
"line": 92
1919
}
2020
}
2121
},
@@ -25,7 +25,7 @@
2525
}
2626
},
2727
"event": {
28-
"ingested": "2021-09-21T09:58:29.100400570Z",
28+
"ingested": "2022-01-10T05:24:51.234486209Z",
2929
"original": "INFO [main] 2021-07-21 12:18:15,910 YamlConfigurationLoader.java:92 - Configuration location: file:/C:/Users/kush.rana/Desktop/Projects/elasticconnectors/apache-cassandra-3.11.10/conf/cassandra.yaml",
3030
"category": [
3131
"database"
@@ -46,14 +46,14 @@
4646
},
4747
"@timestamp": "2021-07-21T12:23:32.856Z",
4848
"ecs": {
49-
"version": "1.12.0"
49+
"version": "8.0.0"
5050
},
5151
"log": {
5252
"level": "INFO",
5353
"origin": {
5454
"file": {
5555
"name": "Message.java",
56-
"line": "826"
56+
"line": 826
5757
}
5858
}
5959
},
@@ -63,7 +63,7 @@
6363
}
6464
},
6565
"event": {
66-
"ingested": "2021-09-21T09:58:29.100412429Z",
66+
"ingested": "2022-01-10T05:24:51.234488598Z",
6767
"original": "INFO [nioEventLoopGroup-2-1] 2021-07-21 12:23:32,856 Message.java:826 - Unexpected exception during request; channel = [id: 0xa6112238, L:/127.0.0.1:9042 - R:/127.0.0.1:60106]\njava.io.IOException: An existing connection was forcibly closed by the remote host\n\tat sun.nio.ch.SocketDispatcher.read0(Native Method) ~[na:1.8.0_291]\n\tat sun.nio.ch.SocketDispatcher.read(SocketDispatcher.java:43) ~[na:1.8.0_291]\n\tat sun.nio.ch.IOUtil.readIntoNativeBuffer(IOUtil.java:223) ~[na:1.8.0_291]\n\tat sun.nio.ch.IOUtil.read(IOUtil.java:192) ~[na:1.8.0_291]\n\tat sun.nio.ch.SocketChannelImpl.read(SocketChannelImpl.java:378) ~[na:1.8.0_291]\n\tat io.netty.buffer.PooledUnsafeDirectByteBuf.setBytes(PooledUnsafeDirectByteBuf.java:221) ~[netty-all-4.0.44.Final.jar:4.0.44.Final]\n\tat io.netty.buffer.AbstractByteBuf.writeBytes(AbstractByteBuf.java:899) ~[netty-all-4.0.44.Final.jar:4.0.44.Final]\n\tat io.netty.channel.socket.nio.NioSocketChannel.doReadBytes(NioSocketChannel.java:276) ~[netty-all-4.0.44.Final.jar:4.0.44.Final]\n\tat io.netty.channel.nio.AbstractNioByteChannel$NioByteUnsafe.read(AbstractNioByteChannel.java:119) ~[netty-all-4.0.44.Final.jar:4.0.44.Final]\n\tat io.netty.channel.nio.NioEventLoop.processSelectedKey(NioEventLoop.java:643) [netty-all-4.0.44.Final.jar:4.0.44.Final]\n\tat io.netty.channel.nio.NioEventLoop.processSelectedKeysOptimized(NioEventLoop.java:566) [netty-all-4.0.44.Final.jar:4.0.44.Final]\n\tat io.netty.channel.nio.NioEventLoop.processSelectedKeys(NioEventLoop.java:480) [netty-all-4.0.44.Final.jar:4.0.44.Final]\n\tat io.netty.channel.nio.NioEventLoop.run(NioEventLoop.java:442) [netty-all-4.0.44.Final.jar:4.0.44.Final]\n\tat io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:131) [netty-all-4.0.44.Final.jar:4.0.44.Final]\n\tat io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:144) [netty-all-4.0.44.Final.jar:4.0.44.Final]\n\tat java.lang.Thread.run(Thread.java:748) [na:1.8.0_291]",
6868
"category": [
6969
"database"
@@ -84,14 +84,14 @@
8484
},
8585
"@timestamp": "2021-07-22T15:16:10.134Z",
8686
"ecs": {
87-
"version": "1.12.0"
87+
"version": "8.0.0"
8888
},
8989
"log": {
9090
"level": "INFO",
9191
"origin": {
9292
"file": {
9393
"name": "StorageService.java",
94-
"line": "681"
94+
"line": 681
9595
}
9696
}
9797
},
@@ -101,7 +101,7 @@
101101
}
102102
},
103103
"event": {
104-
"ingested": "2021-09-21T09:58:29.100415655Z",
104+
"ingested": "2022-01-10T05:24:51.234489753Z",
105105
"original": "INFO [main] 2021-07-22 15:16:10,134 StorageService.java:681 - Token metadata: Normal Tokens:\nlocalhost/127.0.0.1:[-9213409579976581007, -9208536521948527928, -9138148778360337250, -9127679418115980016, -8976989747173636951, -8928929930114662189, -8850922876008716693, -8742572573666294013, -8682790054622712291, -8602448569428641857, -8427444260690062087, -8322248594442534434, -8320001287302042084, -8254990830747485697, -8249957862499495790, -8189195602746080394, -8129887952616066480, -8056374640546524116, -8038761382995613210, -8037170110133462140, -7992011367541245422, -7880071995925335357, -7749009042440224717, -7617052974926155684, -7579992376331554614, -7547752740136860669, -7483309149196458963, -7403928085586378365, -7295126747625344073, -7285427200042709300, -7208686794243768519, -7117693125722831897, -6883722024573005241, -6720612224987504455, -6717012773506031630, -6634852508780100068, -6552838126854940220, -6342653427563558228, -6320996911175515573, -5938863381584705682, -5937138028307335156, -5863008324229999355, -5557902421394732795, -5507288642909724159, -5359164966940526093, -5270856020393654677, -5140336908990033565, -5086699786885043460, -5074000871253631366, -5073978841190866944, -5033423903877820246, -4943085258474057592, -4910543332786614489, -4879770268169959108, -4850099303163390815, -4807455567471793547, -4719159438210854274, -4619781027025280965, -4544597174348575652, -4485428936415138994, -4472739122485282685, -4373079504728124492, -4181301628202154089, -4126388626984258138, -4023053100851092991, -3922047779752166298, -3906718855618646650, -3868634824115722238, -3745879358169402556, -3690097830756775997, -3670927950016768037, -3616747246231509319, -3591426209432189634, -3490702446505255801, -3483385134981416558, -3429491430707856745, -3416053347785698066, -3413943292199611161, -3382417634862376426, -3349947830775906953, -3296542850568272055, -3176473778862080919, -3166346545442410180, -3132772882761113905, -3043642279006642678, -2954123492179139102, -2863171390983702241, -2654073953489285272, -2590940177673686644, -2587080257265847771, -2251605852203586301, -2198878564462361531, -2145896005604227928, -2124367674677225113, -2100796974152514459, -2100767007153930839, -2048246436708511951, -1940231583736341613, -1918276191425512270, -1901156852629539284, -1880561834882743663, -1746302695032098428, -1656872679451617615, -1548673391155746482, -1488479865253002047, -1379516031698548835, -1375032214470929604, -1314590380943603420, -1308375119031032813, -1285371162065374453, -1236769884793871491, -1079440989079766338, -869710792032024432, -789236985842188234, -455105751942515560, -444051516445821516, -361900680170942718, -168328735467397181, -134714950793282931, 60826037083339962, 84541622509618720, 144554169302448103, 196774206633592259, 198562324344386301, 238610642455775463, 278056991129882380, 279880939653579207, 282592745265744974, 410971596053594328, 495924051707529203, 526093410792433875, 575034598008591456, 579720708854555015, 589085295330075427, 590435486579344463, 776031051171600786, 781641065494177208, 846457757495601745, 850257452008846361, 900686269816010653, 1051126519181924424, 1203321605454295227, 1203895566636331975, 1211465458560787736, 1225960882717793263, 1241774140877981683, 1292414550010972366, 1334361932455738343, 1337377210995562847, 1419081732672037948, 1419381122950575881, 1490964106631451820, 1639326652578045878, 1705770160551872440, 1832285348848161986, 1847497393690487631, 1879480685217394570, 1891538878205257739, 1989643415414534081, 1994910556424959679, 1998064184769937808, 2155104014043103344, 2220336291482261989, 2283828190095512675, 2306824176141659302, 2451278539468942429, 2598912773538613706, 2762278292210005010, 2773437737237250294, 2832174370654635432, 2934442852597210012, 2945700216164622238, 2952556039929943093, 3107437902315470865, 3123397929954224804, 3186025726071011271, 3188208477416257432, 3200767480243736192, 3215706690514302654, 3276105622621268635, 3365884355288559483, 3401162000846683197, 3490150748579176060, 3504387869819626580, 3724159158070359927, 3885983949513817526, 3928206314063268933, 4115069486609707213, 4242350427466708713, 4386862705409556464, 4404914535424634841, 4486289098334426088, 4615905347775520925, 4650730553761950776, 4664032552573343869, 4741710988150565521, 4824314289830954773, 4855150021956252527, 4979447180744678768, 5010835932690867774, 5135899429065919974, 5230763194691689473, 5318582515931199681, 5558115297723062617, 5588210318754588806, 5615741481489697481, 5681975707573416981, 5826288747232227118, 6135206485758434356, 6163357531758535338, 6192919223175738327, 6193503193865707083, 6251171521552312359, 6370634172051452277, 6440400015024985128, 6444714481840758288, 6619609681089611411, 6698206135058175326, 6723548174665139367, 6744705100400054244, 6777227783060561616, 6840248229536654533, 6903596833014731591, 6939254918732562615, 6986844194665101330, 6999783490815861150, 7081735174733692632, 7088499763485696293, 7164209991011322273, 7180706869985461496, 7369129159637618981, 7375016321335570664, 7518640636490654215, 7584590997557423209, 7665483325181367542, 7751011211020015083, 7808711095476824306, 7905270090323370693, 7930480210183871741, 8027805212938904497, 8086730665555500916, 8156173380772627797, 8455783018781361766, 8522975246241517657, 8525946248784902240, 8547978838832864285, 8580320166686867118, 8587722170086323264, 8726678858413102621, 8732783454936618116, 8734728266269135300, 8789489738850249699, 8799590254811299859, 8825243461020618263, 9047662432134874749, 9087960439561935209]\n",
106106
"category": [
107107
"database"

‎packages/cassandra/data_stream/log/elasticsearch/ingest_pipeline/default.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ processors:
66
value: '{{_ingest.timestamp}}'
77
- set:
88
field: ecs.version
9-
value: '1.12.0'
9+
value: '8.0.0'
1010
- rename:
1111
field: message
1212
target_field: event.original
@@ -16,7 +16,7 @@ processors:
1616
pattern_definitions:
1717
GREEDYMULTILINE: "(.|\\n|\\t)*"
1818
patterns:
19-
- "%{LOGLEVEL:log.level}%{SPACE}\\[%{GREEDYDATA:process.thread.name}\\]%{SPACE}%{TIMESTAMP_ISO8601:cassandra.log.timestamp}%{SPACE}%{DATA:log.origin.file.name}\\:%{INT:log.origin.file.line}%{SPACE}\\-%{SPACE}%{GREEDYDATA:message}%{GREEDYMULTILINE:cassandra.log.meta}"
19+
- "%{LOGLEVEL:log.level}%{SPACE}\\[%{GREEDYDATA:process.thread.name}\\]%{SPACE}%{TIMESTAMP_ISO8601:cassandra.log.timestamp}%{SPACE}%{DATA:log.origin.file.name}\\:%{INT:log.origin.file.line:long}%{SPACE}\\-%{SPACE}%{GREEDYDATA:message}%{GREEDYMULTILINE:cassandra.log.meta}"
2020
ignore_missing: true
2121
- date:
2222
field: cassandra.log.timestamp
@@ -44,4 +44,4 @@ processors:
4444
on_failure:
4545
- set:
4646
field: error.message
47-
value: '{{ _ingest.on_failure_message }}'
47+
value: '{{ _ingest.on_failure_message }}'

‎packages/cassandra/data_stream/log/sample_event.json‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
{
2-
"@timestamp": "2021-10-05T07:40:26.558Z",
2+
"@timestamp": "2022-01-10T06:21:52.507Z",
33
"agent": {
4-
"ephemeral_id": "37f2fc52-9bf4-4fe3-a5c6-ac3a89d10c87",
5-
"hostname": "docker-fleet-agent",
6-
"id": "55e3ef5d-1870-4291-8cff-32abd8b8b84b",
4+
"ephemeral_id": "a8a31530-f653-49ff-9daf-b691bb365ddb",
5+
"id": "25ee0259-10b8-4a16-9f80-d18ce8ad6442",
76
"name": "docker-fleet-agent",
87
"type": "filebeat",
9-
"version": "7.15.0"
8+
"version": "8.0.0-beta1"
109
},
1110
"cassandra": {
1211
"log": {
@@ -19,40 +18,40 @@
1918
"type": "logs"
2019
},
2120
"ecs": {
22-
"version": "1.12.0"
21+
"version": "8.0.0"
2322
},
2423
"elastic_agent": {
25-
"id": "55e3ef5d-1870-4291-8cff-32abd8b8b84b",
26-
"snapshot": true,
27-
"version": "7.15.0"
24+
"id": "25ee0259-10b8-4a16-9f80-d18ce8ad6442",
25+
"snapshot": false,
26+
"version": "8.0.0-beta1"
2827
},
2928
"event": {
3029
"agent_id_status": "verified",
3130
"category": [
3231
"database"
3332
],
3433
"dataset": "cassandra.log",
35-
"ingested": "2021-10-05T07:40:53Z",
34+
"ingested": "2022-01-10T06:22:16Z",
3635
"kind": "event",
37-
"original": "INFO [main] 2021-10-05 07:40:26,558 YamlConfigurationLoader.java:92 - Configuration location: file:/etc/cassandra/cassandra.yaml",
36+
"original": "INFO [main] 2022-01-10 06:21:52,507 YamlConfigurationLoader.java:92 - Configuration location: file:/etc/cassandra/cassandra.yaml",
3837
"type": "info"
3938
},
4039
"host": {
4140
"architecture": "x86_64",
4241
"containerized": true,
4342
"hostname": "docker-fleet-agent",
44-
"id": "6505f7ca36739e7eb909bdb52bf3ec18",
43+
"id": "4ccba669f0df47fa3f57a9e4169ae7f1",
4544
"ip": [
46-
"172.27.0.10"
45+
"172.18.0.7"
4746
],
4847
"mac": [
49-
"02:42:ac:1b:00:0a"
48+
"02:42:ac:12:00:07"
5049
],
5150
"name": "docker-fleet-agent",
5251
"os": {
5352
"codename": "Core",
5453
"family": "redhat",
55-
"kernel": "3.10.0-1062.el7.x86_64",
54+
"kernel": "5.11.0-43-generic",
5655
"name": "CentOS Linux",
5756
"platform": "centos",
5857
"type": "linux",
@@ -70,7 +69,7 @@
7069
"offset": 0,
7170
"origin": {
7271
"file": {
73-
"line": "92",
72+
"line": 92,
7473
"name": "YamlConfigurationLoader.java"
7574
}
7675
}

‎packages/cassandra/data_stream/metrics/elasticsearch/ingest_pipeline/default.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Pipeline for parsing cassandra metrics.
33
processors:
44
- set:
55
field: ecs.version
6-
value: '1.12.0'
6+
value: '8.0.0'
77
- rename:
88
field: jolokia
99
target_field: cassandra

0 commit comments

Comments
 (0)