From 8c3cf73163d4d8351069302d44f23d7e5c6660b3 Mon Sep 17 00:00:00 2001 From: ruflin Date: Mon, 23 Jul 2018 13:36:05 +0200 Subject: [PATCH] Fix Filebeat tests with new region_iso_code field In https://github.com/elastic/elasticsearch/pull/31669 the field `region_iso_code` was added to the geoip processor. Because of this test broke with the most recent release of Elasticsearch as the events contain an undocumented field. --- filebeat/docs/fields.asciidoc | 70 +++++++++++++++++++ filebeat/include/fields.go | 2 +- .../module/apache2/access/_meta/fields.yml | 5 +- filebeat/module/auditd/log/_meta/fields.yml | 4 ++ .../startup/test/test.log-expected.json | 4 +- filebeat/module/iis/access/_meta/fields.yml | 4 ++ .../iis/access/test/test.log-expected.json | 2 + filebeat/module/iis/error/_meta/fields.yml | 4 ++ .../iis/error/test/test.log-expected.json | 3 + .../test/state-change-1.1.0.log-expected.json | 22 +++--- filebeat/module/nginx/access/_meta/fields.yml | 5 +- .../nginx/access/test/test.log-expected.json | 3 + filebeat/module/system/auth/_meta/fields.yml | 5 +- .../system/auth/test/test.log-expected.json | 1 + .../module/traefik/access/_meta/fields.yml | 4 ++ .../access/test/test.log-expected.json | 1 + testing/environments/args.yml | 2 +- 17 files changed, 123 insertions(+), 18 deletions(-) diff --git a/filebeat/docs/fields.asciidoc b/filebeat/docs/fields.asciidoc index 615b55be10f..62389c539b3 100644 --- a/filebeat/docs/fields.asciidoc +++ b/filebeat/docs/fields.asciidoc @@ -305,6 +305,16 @@ type: keyword The city name. +-- + +*`apache2.access.geoip.region_iso_code`*:: ++ +-- +type: keyword + +Region ISO code. + + -- [float] @@ -556,6 +566,16 @@ type: geo_point The longitude and latitude. +-- + +*`auditd.log.geoip.region_iso_code`*:: ++ +-- +type: keyword + +Region ISO code. + + -- [[exported-fields-beat]] @@ -2000,6 +2020,16 @@ type: keyword The city name. +-- + +*`iis.access.geoip.region_iso_code`*:: ++ +-- +type: keyword + +Region ISO code. + + -- [float] @@ -2166,6 +2196,16 @@ type: keyword The city name. +-- + +*`iis.error.geoip.region_iso_code`*:: ++ +-- +type: keyword + +Region ISO code. + + -- [[exported-fields-kafka]] @@ -3353,6 +3393,16 @@ type: keyword The city name. +-- + +*`nginx.access.geoip.region_iso_code`*:: ++ +-- +type: keyword + +Region ISO code. + + -- [float] @@ -3890,6 +3940,16 @@ type: geo_point The longitude and latitude. +-- + +*`system.auth.ssh.geoip.region_iso_code`*:: ++ +-- +type: keyword + +Region ISO code. + + -- [float] @@ -4333,6 +4393,16 @@ type: keyword The city name. +-- + +*`traefik.access.geoip.region_iso_code`*:: ++ +-- +type: keyword + +Region ISO code. + + -- *`traefik.access.request_count`*:: diff --git a/filebeat/include/fields.go b/filebeat/include/fields.go index 50090ec4e8d..b8576ce4a90 100644 --- a/filebeat/include/fields.go +++ b/filebeat/include/fields.go @@ -31,5 +31,5 @@ func init() { // Asset returns asset data func Asset() string { - return "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" + return "eJzsfetz2ziy7/f5K1D+ssktRXEek7PjU3XqZP1ItJvXxs7u3ZNNyRAJURiTAAcA7WhO7f9+Cw2AT5AiJcqeuSt/SEUS2f0D0Gg0Gt2NH56gG7I+QQuC1Q8IKapicoL+ZD6FRAaCpopydoL+6weEEDrlTGHKJAp4knAG76ElJXEoEb7FNMaLmCDKEI5jRG4JU0itUyKnPyD72MkPQOgJYjghhvFU/xe+9fLUf1crAi8gvkRqRQAhkoSFlEXwRcwjlBApcUTkFM1KT8FrVOakJFEaoP494GxJo0xgzQ4taUwm+nv9I1boFseZfhNlkoRAkyr9kXFVJgavoBWXynKyz19xYFXBMdG/wVfX+uN1TodDi9txTZud5jhu7rgcG5ZIEJUJRkK0WAMrnhLNhkVIrqUiCeIM3a1osCqAl/pOZIxRFnnQKJqQXznrgcY9uU80t0RIytlmMPZBJ1YgzjD4EWEaCgmRWlFpRHlaFd2j/9ZNkQon6ZElqmX9BIVYuX4Q5JeMChKeICUy9+WSiwSrynPkO05SPfVeZ1EmFXr+Sq3Q8+Nnrybo2fOTFz+e/Phi+uLF8369C5DQnRFkYqehniCCBFyE6A7Lon21RikcyW4ur8WCKoHFGp41vRVgrQpA3lMizEBhFsIHJTCTOFDFeJh+qjE22qHSj3zxMwncXDMf5uaXG7K+4yLsBprrqkwSUcwpraAMsxoCIgQXFQCR4FnazeRcv+Q0YGA4avnFYUj1szhGlC25ntkBlqC/gI+cOmGwWtERdGisMsu/d5gU+a5KX7bAKqBZOtMGg4CHTeoxZ9EQ6ppIk7Sm1SBdHbNe1I2Y2CUqiHkWFmvUqf6IUsFvaUh0MxUOscL+Zeu9/RUtBU8MpfxVqceqUEE4DOfwwNyR1E8GREouWlcx/egU3po6svWJTYINs/dDaXmrIpyiT1xKqgUX1iSJsCCa4ARFAZkgLlBII6pwzAOC2bQVG2VSYRaQOd0wdWb2QTQ7c5D0IoISHKwoq09dH4fNK1POo7yu9+NiH5iX5CzvZ/V8mpCQZkk39/eGBIjYMObWzKExVet5acnLEWTyCcFSPXkWbFCkJUIIVkRarHZUGjhUFstch8iBbsxHNYdif3nyvb/o2Vc0ljecRzExM62duyDRxqX2MzyzqX12ooc8uIH5Y2f6mfvsIW5+Q1JhpdVvHJNAr9kwzc1ves7KFRdqblaAE7TEsdSDhlmw4sLxe5LP8h+qStk1OYeFvOtDmx63awIRUxruphO/MPpLRgqCiIY+rZ6zS3zLxyCOZbkAcs46tQC0IbHIaKwQZ11QSspgSySnOU9Nq4tXjBcklg1uFVsCddsTG7DMoCcMn1xotTAXIvvWfPIQmWljoCSoepVrqJ5CNvX3GyXT8h4ml7uPyVu7rWiOxkiSbhSER8ixCFZUkUBlYoQ2VMihR2QaTdH3P76av3o5QVgkE5SmwQQlNJWPm1C4nKYxVtqk3w3Jx0vkCFkMAWGKywnKFhlT2QTdURbyuxYQ1R3P9hgsHS+PJU5ovN6ZhSFjGylIuMJqgkKyoJhN0FIQspBhV2tp2oBQ+aqD+zsqlVZos09PcBgKIiWRTQYJDnZrpGOzwiK8w4IUzCYokxmO4zV6//q0jMHpkZtsQQQjishCm/yl/J2HbfF7bgZXbdqCKCrrku5lsXhpowKqgEaD1FDKwxGWh1IPpDw0us3LKttVNZU4feIh+jI7azLS/8oUB+M1qqDYZKZ3YKP2oKbY0oV9F9d+jAw1lOC0yQkzxhX4v0ZjVyLp5zmmwVLiG1Rsly62I5hsXr6GrtUwMY8K1fKOR+BfhIcJ2+T1jd3jMWVVp265QZJnIhd+Xxu8XrEOpxawBJu+cAZqBGCACoLDKbrSOwoA49otzXZ+IXmcKYJSrFZIcfiy8Kjqvwsuih3T9dNbLJ7GPHpqPJDTmEfXtc0PXy4lqVpcJb9J0TinUfu0ztAEdIKkXGjjEJooFRZKIlz3Plb9Qw3fEI0YF2SOF/yWnKDjLTveSoXbAwAg3d9mMJzf3XRnVQSUIDjpJQI9eklLqaFovJoaAmVRScJjHsmJc0P+QaqQZ+oPiAv4PxHiD1V4qeAyJYHiYlryIQztHcrSzJxv1IXTuFyrftayiFJpzgaMOJqDBg2ILikpJrrbHFxrFte1MwLDXBJwrLoBuqAxAR+2WdTNyKBHZ+efPp+fvr46PztBkhB0DS9D068fV3um+OX/706ptloL1Dx3nXc3cmY9uYZfRKRCKU0JzI0UC0mM4ikc8ZW5YmeUnCCqkFRckGJ9gxMQQSPKcIyui9OFa/RIkFQQSZhy5136x8LFrylXFOJj0yOlwxLo44bPPSaSqGnCwyzuMbZ5T5oXep+UOD79jqtyLva13mzkWsY8mi5xAD618RS0JYjIdyVw4WAy7jLKBVVrPxT362hQHEEn24ZPV29Ickv0G3OwtsbSyHCsmCXY6GI4U3GMugdl7zAco2lD4+stzDQVPBLjrUz1c2lLvo15vvsYQRJoWGIK5GvHWSATblRG4+sIOuZe0SPilgaVbcmAc7tL87b19FUIa0mKyW2nALXbEJFWnvC6t6sCQbR+qZAuHdG20K28W7U99cvVE+xiCbQvTPPlhC9zkvmMlkbXUdmh6fUe32lMQ40nKRZUlpxBxVKiaZVERmtT/zqleUDMw4KrFZw30VAvPwGOc7KcxesybbniWRxqCwwiIKp9vFIqnQoiU84kmUqFVSbnpTPIhmS29Pfbq6tPyNFBJTrOoM9N+ZfHL7sgkBinkphlfyCGc/OqWYQXRN0RMEp/ybQxgFlY4KMMJTSOqbZJOGscOVcRWdtgHhMWqdVATKfWVDcvu9lZ7a0FD+t60SIA6NOEqBUPh8+tz7bp5v3cJ45THKzI82K3efTafHPk32baX9F7Z45UHVTW/vTtOAtOaMjhvWPowgHMt22uKhzoKdPYnpf5dPBC5X20jRdwtqzDoUfrzPKBLc209HodFqrYrwlXZF5xg7aNYQ+cgDWmWpxmn5D1Uk69nDNJxLzmLtmRs15lIGQDFlatSoz6W2BJA4QztTKKyBj+NtzKC64iz32Q5brjzfnVcNBOA8Ckc3PB22kiHre7Kpy/fH7nZ6vn+rx5UDACf+DbODpAFQk1OmheCztBbaEnQzjnCq4ajlLmr1XfXG+gpou1IrIvAheq5XupBzqWJQsitDIGArnVTsQtEXW97O+2JREiP3au4t1tuBxpP2McGW9gk2stAKkHy9OyUZSxJ7BLDs0cBz5IKkFZNEUftUVhd7qIms7SjzVImtfOYywVDSTBIlihNM4iymyEZikalQv4ol1NgA5rb3BdwQ9tsW3ul6K5Zi8+VmuLlmrTo9lM/9JR7oCQaIO78XO3nPXoBuTbIa3WUluRlmkdavkU7mfe7IqOuToAENCuB38W8tgBirL9gdK0twGVYhWs9jd6QH4bXB6zoA+sfBE+XQnupbCF2PXBy+savg/aLbDUo5y7EM3vfRoMQ3ff82EQui0FcPQhdZAiwltM9F3WmDeEzz5BlLG2VXRfRVitiCChNplJiDiz50p2k+B8wXWKvvXIEO+19DTobbMU6T0wZXoXfH+Dl/NsF6aAZ0yJ9ZxK7rNgRwJ2arig2eVHjymLKo4ws/9pxRERPk85bZg0A7pIz16qstDYFTFW8KEdkwkE3fO4GSa1KMA6koCq9Z5xaBYbUNj+2K/I2MjapsT4shrQNk6LC+urcN5B46wwdAc5KcqO2z490GMjkzujgbabz42UhzKKAPwa48IonCRFAD94TxonV7bf2twV9ZQPtMOuy0zhKCJhd4ek1O8h2W4/bh3LaHbm56ZG5aZW4AJvY1Y516zy23qs7dFnKniYBaXsw0o/OwdoFlIVlv2f8EWL+9O4PcEpqLeMkEUEz+ezrL8/1DFGQ9yh9Zle4446fKMmqKjaxTvomHeUZd8NfzjzQR/0jj6O81RTQVDIgywhTM8rbeygBQlwJqujrVZkbR5eM5zQAFayWyzWaLG25Isk1f7O1oCLcF5LcuopPl1MS7ZrHM5x1pgqG+hfGIVMWf30CCzUOLTMZ2fGqeq8z7A1goNlpHiDKNAAqn6ojNyNDZWRuxzqtNRrszMX4QP4fWAFDghaZhDJ7SjzopX6K2vZUmFPtNQaBSvMIiLRo5jeNNfpBQl4omej4Fw9bh8wOdRDuHG8JJGw9xl/xMbFqgeswDpFM1UbKKQoQdi3QdAtqA3YYl0m5m2CJL9khDVcVrssJeWJ6chb/22LhzQItliRjR8igP2E2YRgKXlAwT64o2pVPlT3sW0u130MlLNGrICX9j6JU0WSnVzoQABqC7CuDtKPDWej33JxaCykAVZE2oN7+IlneRSk4grHdVzNbQBEttmnqES/EsGfwH78PxG20W18iY5RQjCTtrSACU4VUgHRFrk7Ht46QxOLCFZMpxJtjn2A47j10GY4L0FkFqtSgJLjgR7JzBxtcoGWmMaZIC3q9GEdJdfG8Jlqy0Pb9dcNkh0O/IPD5L624BVEEPHVBuZePBNlOIbhwZ1U7p8t3Un37D6xOzdSnr+lDVzl+5Z9XOWZIpjFt0+rs0H9t2uteZ2efKAKgaNyVq9++qj0ZH72cnT79w9/lv/z4qixrav3dxE5HpLv3Zxn+hF43M9zaePYnigi1RMI5h7Kn7bmyVjuNPTzxh/fRGd3iy+fl6d/+/E/Xl8GvyxOo7v+7OUKi7CTfR6vCY/6URz3ZwiL1Pab7k5PHV43TqGrjYEJrZ+qBvm7wGwXxq5ICFaEmpgyMCkX+jdE0/mSxoqIoxqXoif0W/Vf2yd8JZJz49Yc4LvKD3YvvsIK8SDIBATDYsbZOuGZnJtorHlIGCXhpBZ+NNdmDHxde8p8jARmSn8OOGMmKcH7nXtN4STV5sjcxvNMkMjYHJcI2c/mhfbOq/If3o1m+Db349/B86JKEUj1gUePmr8YmcHo8/nlFXr9aeZeflyWkvw9E+gaEHpbWGjFY3rrzkj8eAJrWDyH5MVHxicXaDNdf6ZSZtb96li1911BZ+t+s87gjSJY8hvXcmWandYO+NlPz6fPXv1x+mz68rkfcs2WLsLSKQtoiutO+SbQ/En0SG9g9euPzZQxE6A2LdqxzvOJNbxzazWk2rCW7TDzikGq5Yh8J0HW2ZlBnElFxEnCGVVcPE0wbTRnM9RM0I04QfoJC8GsQl8+z1pBPZ1/T3Fw81SSIBNUrZ/OS93d371dGFYgW70VpJPFAb14GhMsLgPB49jGBg/vQ8t2vuDheiNW/VBhfFvlSZeIML3Z6kCqX/Rjq5y4FJFSqSANW3nHpTff9TbLDgzwob85zROmqvHMPpZltukKS78UbbHZtp58m7cXIMU1MGAxdGe7v+1a2QJ+c+rKsWhN4QVaGn5bk3EuSdAKbRlzvOU+6bSGJGcILkNhql0a582f8S1Gt1SoDMflyjF+4DIQ2WIu18mCx3Ol5wTkPeyrHegThkKXNIEUCJv8gIKYYKiOl6XIYEGAxeM9qwGH+NB7AN4DN0DZiPuO4Ju5IEs5t05RwL9H5Fcas0y1LVtwBBgm0pewgMhSo7rCCQWOYxLPBZEBZveFutTfCRY3kKtFb4mt9gDO2JggnKZxKfZfKp6mTadZ+bgfSznPWMxthu89tMRwA3lhcAACIHr2fpBm5ZSkJkafUu6J8ZM9nD/99MXIuJUXIpZcJCaj3ikgD8R2lY3q0dT+TkYbO7pnQ/RfrRE8U5KGZjNyQwQjsa8BlbzUB0BJWR0k6kQpCI7vA+YVnGnYlLg6aMUhqTAmyhWAy1cp2LZAiQo4x6OMypXfpf/zbTIXGWuZgu0N6RMFoqECkj//7b1Fk6Wl2TZBWCJsyGspNyZ31+GeCSyRczjrmWst06Y8tkb+BosFjiq9abnaEybN1Q6DT2kUpTZ4msLq4jCP3cUaguL8Rg+xAWVxduIqVRKuQtgq9ObNKQTZmKU3amG5Ini0U6O3BKcIx84zDk5rOy7018G2rH5nfrNoVeqUKRJ5Mj/6LT0ASzce+GjBv6Exh5Sj9oVGr0x7g/RFQlgOTjvAlGMnIuLPSNti4D7GoQu5g7jxIMhSzIL1b38EYfD4EkI/Si34DQxna59uHt01z1g05vj+QxP8nY/wut6G38AYd/SrH1252kOFadU9c2mSHV2hqOYBR10GmuNUHJsmKWf18N0qu3dQZMc+V/XsFF4fPiXTYJpM3xOFz7DCp1CNAQ6IbPWJ6pttC5fXc1NHZJYuH8Gm9Hf5aUBouubKkRnCN6ft7i6/q8s3C/2zJdfZrLlBqWKpc+pC0RG5lVsTd81At9EZFsM557dErAgOO8a1Tbh8I11hlE+cmN9VA2drM8f87uLiwMI9rx9AN/l/fX787I9Pjl89ef7T1bPjk+NXJ89eTn568eLb19mHi4/o21dzUmpITC2I6S8ZEetv6Ovt/G9/Xv38t2/oa0KUoAGcx76avpgeP9F0p8evps9ffft6/A1Mwq8vpz8m8tsEPsyh1IX8+hI+a8N5RZX8+uynly9+1F+tUyK/fpuYat3wH4AAx0xf//rl/PM/5ldvzz/ML86vTt/mNOC0VH59pp+HwoJf//efR4D2n0cn//vPowSrYDXHcWw+LjiX6p9HJ8+mx//617++TXbRNxDWLbqVTWQLFbRJg7ezl0RVR2+zitEd3IEEjHSqcjvd+uhhvwad1YbvxfFxIn1QahkHOQ49il1A9O9DpkZ7k0FOOlhdKqwozIYh/FraVZLFLpYmqEM/1cazLsgD2wwiPoch68IR87vucR0wSQb0ElRAm1cKfPrgnevHbFvKAXcjjFNJ0WyaDjAXXAUeu1dtQfDy+cDJ6LRbFwazLaNqVKZGHW5kq8eektDEmrQBeD4MgOCZorUVusr7s3mibZjl8bO3//P8r3+6+ennu5eRivCFYsOmB+1YkGfhKFpngwa46pj6IQ+6eNnYMhpQFuFSUNkMvmiJJjM/doeR5RTR7vFjIVlkO+XytBU5sg0B+oPyBmv1HDeN4wZ4+u/SVhWV6A5ur3LbBSgNb2DajK6N6YS1+nojgPPd9XMEvXY0QUeMK707mWjDolCrE3R0hwXTUw958vGPAkGhdNvRQyceFsU96A4H6BuFTJM/yNi/uYzBQUDWvCxiPDGzHA6S9m8maW4hp7K8is8u+yf2zmaXuUestY4+pe33afRI4W3wQPde3FBD2KKcofEojlrO8Koou7appOGhamCFLewibQTOfvgDBxtYA1F7mLWUw0u58Jdu2C7n0wGASOKu4+DfdJXLPRT/vCpKWGyaLQ9WofChK0pKiEvDKutdTLIvc5ktDOEO7neUvXg+Pv+/m1u30Eb+LjoXgg0aeb1jTEoXhFf23rSMBFVkD7NTk7Up2ixENL+utENP2IVrfCzloHa7jFUKi+cX8xDI+Kvd8OyD+pDFYAPOb+jIPVS7qsawQNIkI+UJJN3LS+1K9ZGQwTWGK4JDq+y7MfxOC9UCbNfLvynoRpu0Iz9Uuh0lub5U6TY7VLo9VLo9VLrdDOtQ6baE6FDp9lDpdqQCLodKt/bvUOl2n6VJ9jtuh0q31b/9V7pt82APL3X70C454D6ys9Qy3+grfVjnveU+ctst841tf0inyuHYosL2od3DgmDJ2Txdibbs+l2d45o+MvRbT26yfThG4VSvlIebch57VoiDLZj/HWzBgy14sAXHw9JWtu8GL2/KkZV/0Z9bojLgt6JEvC8Aw5FDu4dV7lgg3YB1F7P2tkPrV5r37OKr9vvL40aZkbyFnusditDYv7/+/KGehdMv8sbd2Ovj+TA3JvjT0HZaVk/zoC3X0VQiW3Zc93/bXRa4UWVs28ZDPRkgOAgCVFwfa3FH6AoKuFPWIW89VlNPt6BxFE+tl0y9+a5+QhulFXUNWk9YCL03tFGKRVGoWqNrh7PM4vp8HQcLVJzO4th1T300nbKmC8zK2tp80aKuzY/dcfA5RfS7VdijFk34i+mzzYUTpBpSSG6zNsuEMIedcAP60gJp3bfWbwYwrE3hn9pP5su5N7Ei5pFUWJbr9bqvWoTK/dwtViW6aHTBskDflYBWu2GXa1Rc84b4rsZdU1tOxPXE8DHqMiZ23LXmpkTtmqiJqVsbcGF29XBfxTsevfzZPN4WJbq/u4W4sEvMXV5etVZVt6tozUgDNyvtrPGCZ8YyERlj5tIjuHipAKh7dwO8mEdzaEf/2b4B4w1Z2xt94oyYzCJQdCWvQAGlMRGb6deDJ1yTxGFmHWbWvc+s9lk1HN1nfIfCLEnz817DOvYwyaMywDM2sqOxXKPTMOji3Uja3E1ibOXbgvcJmrE0U3KCLqBuuZygj5nS32iZOuUhCdrKYHF+M6fMl7K8vSP6HLL7oWQY1D6zaUnORdknaNbhYpg1okH2BguYdaGyw5ligVuCiodL9KWp2JlfuVOCZK7SszVWNwOaexep3davJ/9VRVaBZPICFusSZs+C1vUfaxonnEU8XJQsY/tN/5Sl9/qFsz9tTlsqeKEhqUtV87XEbd+XD3oOftsQ+FBsyJ7bJJyNG0x9i3fuR5tVvt6Uyt6jXlIT0UXGoBohjlGAFYm4oL/aglAbwJ1+fP/+9YezgRBZY0b3MHzId7URDmVUYRbGVKpa9bFNoHxk+xgZ1gfT6b4qaTE3N9fyl7g0M9+vL//6rv+81KzglerM7H1XqGOPts0zbAGAOmbs+KEaVSDDIzbu01NuTLz5aDfhvoagd9PyH6f/MX0+qdzOaC1KGk7hFkfznA0lkPk1kuU3GxzMxXhBJdbb1hKmLcf+G44DbH5vR0O7txoPfR4w4iZygyxrDoNE2RNY36Ohhpm5kRPSyKEkXlgUkGpPmRnODFJi7JUnbp/TwdqNQtuNpo3wgj5BDI27V0YAYnJltUKYjl3jGKr6gFldoNE2/GSnOscxD272ghcncMOpNmqrmO8wVaWrbDUArX0WpAirgDt/G1SNlUzlTu0V/E5CdtVIqreagKSpI0FUJlhhtndMHkCjlSJlZMxr0WuIZIBZP0Btq+AuYDJGv5fWSIVvCCt03PXl+VXx63UXuGZNtH6xe3mptBblMWbPF5d6odlZLuSWu7X3WETZ95K990F/HmbvwStb2nuOPdrF3vMAQPdeXaIAskWNiTwubK43CF4RwELggQL3mpm3zL1JmkNpoSESrsamWmdppu7Kenv5b8CThDOtDCkL4iwkE7QgkobEGFwm/rbBsSA/qbAyY2XSTiWK6Q1B1//3yQUXd1iEJNT/u56iS0IQjqW5UuY675NrX7DcHoObTxuBzaVri9NsEdOgsWBXEcMoXpvOn6LZEjFevNjgV/QSFsQF/1mr2WPrWhyC3mLVtBx8QJocAVirvfabLS5xiCqusH3IAO+Hjmj+nWamP1iBkkNi+diJ5V8OieWHxPJDYvkhsfyQWH5ILK+DOSQTHZKJDslEh2SiwVgeJrG8cF4NP6wcOYbv3ACAAIRHZBpNDaQJcoV2H7cE64zmOv2UHyYSpuiSEoEefZqdtfBVI7ps7dGoY9uW8OO8uuMd2p4WnuJN7Mc/1TQi5+havzSXzsPuPNMfZX7FiIeo9QmT7ykXqjheuLZ0rrtz6wpuaPeYekFkFqvdpig4X5f+Nhn6yNyIJInqO1HH9+qVF117CLjCqij2aHyYEKvZ4pUIPIveDqAuuECUBYIkhCm9J8UKT+AGZ4iy1VaUibPNC1PiMGycdiFTpDHhtyQEJ3mAGVoQxBm09gjeOZqgI/vM0US/cCQZTuWKq5ZK4Csu1byYXeOORElXOX0Ox9qVupxWyq37gUoX5ttc8j5o0zOO1zmh5sqYO1sY/e67I3pbVfSlekJnpQtkqHy6jCRlgQ2aTnmwmppbPnXjA56kcPOL0QD/XTrQC3icJW11QHFMWIiFtzHZ1qNjAz4FsYZ4Hr1Wu7xYc4UjZGP22/luhyw/rku5VJEg1RitT+bLwYFaxXtbnt5V0KDt4yurQPYdYlk/PmzrBvf3m4nUogn5tXnXYU9Wv1rtlbO9n3Cwsjnl1x9NB2kRmYXDhLJBcVkuUr9BNveNYoUXzSooBc9kbQKRB7P0Uu4XgXbx+ur1u7Hjz0JfKHlXJE35Hr7p8SA4Zy5GnC8RHho3UfC9PH93fnqF/g+6+PzxPYyh/M9BOP5qq/djBSbAQwXmWW0tSFi5leOz/tyio+G37tRPRw49eEKxAZtry57Kcrwt2lUp5nN25lZTg8ocxrXFOI2dy6UpVvm72uxTdFoxG68TLBUR1xN0LWN8S/R/ghWNw2v0SK/Mn88unr7+eIHu9D6XRQh+ezzx2abX2pCgjMTX/cNdx0qrazQLMh11Y26JWHAJ7TJX6VyDXXxtr89pwbqXydigOmKE7KULgYVwDaF3YeRWm556FTcicEsxwogRdcfFTWnD3teqCJIhQQ69IsGSBLPQXcTacm7qFozpaLc4vIWuYlHbZbAOFySJBaI7HWtU7VFojY7F6oaMePmU5npD1tUtmesAvRXtHhwsxizGAFGxIsoSuMz5jqpVC6gAx7GGZFc0cxpSWtIu4Yv++w5DYMv9Rs4d7RIu6IOAuuIFM7Uac7/xjrLsO1AtspnuPTsESwTexhyVxtNdaajlQoqeEfbgK9qCayp4JHCyvX2wNeNR9c2nQuE4YOArk67M0mZA46+UvXLEdsvkAHdOkcRQOARNvJJEinuSSMt8pazHQmx9xGpnojR3FAZ6Nbq8fKvbTZm92L7f+WZXrnuPLbHumBrjull19DoISKqMn/EC0zh3M87YLY5peDQtPePhkRDMJMJIZhCOvMxiw25aULDP2IGxMRU23Mpl/ubHzR4W9mg8x1enVzQRK0WSVKEVlmgJD9f7uTPEc0CX1sJJbdRmvXNTLKVeNI+gR01o7g1ZH7WhapzyOyH0/NALalE8uZbvU+0vvQInuHlIm1tsgqcpCZvhzyPj0z1bmLF2iLX5y1PCzI1USUJCihWJ1w5VG2hPOeTOAJMhgKEo8k5dKmnEsMpEU+B74chfz128FpgJ/74h6zbGvmCSLl3XA9DgkJJrO6X1LJq2RN6bv7FjS/zRJe3xJQMiTDafy/c6mR8UZ9IvdmF/yKhqyBnqHdqxN1iGbWdvbY7LGQ3d5uicXvE5fSJ0BvRX3yidIXEpo3VZa3RKGY/MQr5Hi83YaXk6rDvo11yv3dZ1oBVXC6kxf7lXGsyiDx+v4PQxCzkRzbjSXmtDJdBBUwuwNEuUJptvu7sNJNW4ELsn96urf5QWxQpH2uZ8KC3ad1saZYEtvxhSQQLFxXoHEN5g+nycBOdb2uIKi4gou03hJU9IHaC8oypYeY7MS0VOEt/y1q+ral468CNqCBt2SBo3Dv271b3OOct4y2nnXX16dVSRTbYglEUmiKNVaBr7+N7WZhf72VmrITc6QxjEDo4rX1h9D7r6PbTkcVgKG2HkDhrYah+viKdSbw9mIVniLFaGQAc7r4hDDzyIjDvO9y7kZcNJ9xIA2YPMtQIoPFYe9iWX7L4qjhjSJXftA3tILZ5795H24bsnL2kv1g3RG8Md2ofzPTpE7fGHEpgs6U3p/OPKfDMs8Mq+tLl6XcEP7XLi4eWHHqREgoOyS5EE74CPlOrfamAdkuIPSfGHpHgfukNSPDokxR+S4tkhKf6QFN8b1iEp/pAUf0iKPyTFH5LiD0nxDVCHpPjqX69jR7s9nIMUj7j5KtUvNRykl/1ScKYIC9v9BNu5pMpz2PEApePfAeLgRoNo23xvwOB3U4j8Lh1L3h7huQ05BfeOKeX4w/8LAAD//5d6IKQ=" } diff --git a/filebeat/module/apache2/access/_meta/fields.yml b/filebeat/module/apache2/access/_meta/fields.yml index be09717198c..c73354f629e 100644 --- a/filebeat/module/apache2/access/_meta/fields.yml +++ b/filebeat/module/apache2/access/_meta/fields.yml @@ -112,4 +112,7 @@ type: keyword description: > The city name. - + - name: region_iso_code + type: keyword + description: > + Region ISO code. diff --git a/filebeat/module/auditd/log/_meta/fields.yml b/filebeat/module/auditd/log/_meta/fields.yml index 9fff5ca6a7d..55607c9fa44 100644 --- a/filebeat/module/auditd/log/_meta/fields.yml +++ b/filebeat/module/auditd/log/_meta/fields.yml @@ -77,3 +77,7 @@ type: geo_point description: > The longitude and latitude. + - name: region_iso_code + type: keyword + description: > + Region ISO code. diff --git a/filebeat/module/icinga/startup/test/test.log-expected.json b/filebeat/module/icinga/startup/test/test.log-expected.json index bfbe2f0d06a..2f8cd6198c4 100644 --- a/filebeat/module/icinga/startup/test/test.log-expected.json +++ b/filebeat/module/icinga/startup/test/test.log-expected.json @@ -1,6 +1,6 @@ [ { - "@timestamp": "2018-06-27T06:22:36.186Z", + "@timestamp": "2018-07-23T11:50:38.896Z", "fileset.module": "icinga", "fileset.name": "startup", "icinga.startup.facility": "cli", @@ -11,7 +11,7 @@ "prospector.type": "log" }, { - "@timestamp": "2018-06-27T06:22:36.186Z", + "@timestamp": "2018-07-23T11:50:38.896Z", "fileset.module": "icinga", "fileset.name": "startup", "icinga.startup.facility": "cli", diff --git a/filebeat/module/iis/access/_meta/fields.yml b/filebeat/module/iis/access/_meta/fields.yml index c38779f11b7..0a8181fe258 100644 --- a/filebeat/module/iis/access/_meta/fields.yml +++ b/filebeat/module/iis/access/_meta/fields.yml @@ -157,3 +157,7 @@ type: keyword description: > The city name. + - name: region_iso_code + type: keyword + description: > + Region ISO code. diff --git a/filebeat/module/iis/access/test/test.log-expected.json b/filebeat/module/iis/access/test/test.log-expected.json index 7544fbbb01d..78adf0ee379 100644 --- a/filebeat/module/iis/access/test/test.log-expected.json +++ b/filebeat/module/iis/access/test/test.log-expected.json @@ -8,6 +8,7 @@ "iis.access.geoip.country_iso_code": "DE", "iis.access.geoip.location.lat": 52.5167, "iis.access.geoip.location.lon": 13.4, + "iis.access.geoip.region_iso_code": "DE-BE", "iis.access.geoip.region_name": "Land Berlin", "iis.access.method": "GET", "iis.access.port": "80", @@ -73,6 +74,7 @@ "iis.access.geoip.country_iso_code": "DE", "iis.access.geoip.location.lat": 52.5167, "iis.access.geoip.location.lon": 13.4, + "iis.access.geoip.region_iso_code": "DE-BE", "iis.access.geoip.region_name": "Land Berlin", "iis.access.hostname": "example.com", "iis.access.http_version": "1.1", diff --git a/filebeat/module/iis/error/_meta/fields.yml b/filebeat/module/iis/error/_meta/fields.yml index ff48d7407b7..90ff367b836 100644 --- a/filebeat/module/iis/error/_meta/fields.yml +++ b/filebeat/module/iis/error/_meta/fields.yml @@ -71,3 +71,7 @@ type: keyword description: > The city name. + - name: region_iso_code + type: keyword + description: > + Region ISO code. diff --git a/filebeat/module/iis/error/test/test.log-expected.json b/filebeat/module/iis/error/test/test.log-expected.json index 2730859e55b..e565e78cd7b 100644 --- a/filebeat/module/iis/error/test/test.log-expected.json +++ b/filebeat/module/iis/error/test/test.log-expected.json @@ -26,6 +26,7 @@ "iis.error.geoip.country_iso_code": "DE", "iis.error.geoip.location.lat": 52.5167, "iis.error.geoip.location.lon": 13.4, + "iis.error.geoip.region_iso_code": "DE-BE", "iis.error.geoip.region_name": "Land Berlin", "iis.error.http_version": "1.1", "iis.error.method": "GET", @@ -50,6 +51,7 @@ "iis.error.geoip.country_iso_code": "DE", "iis.error.geoip.location.lat": 52.5167, "iis.error.geoip.location.lon": 13.4, + "iis.error.geoip.region_iso_code": "DE-BE", "iis.error.geoip.region_name": "Land Berlin", "iis.error.http_version": "2.0", "iis.error.method": "GET", @@ -74,6 +76,7 @@ "iis.error.geoip.country_iso_code": "DE", "iis.error.geoip.location.lat": 52.5167, "iis.error.geoip.location.lon": 13.4, + "iis.error.geoip.region_iso_code": "DE-BE", "iis.error.geoip.region_name": "Land Berlin", "iis.error.queue_name": "-", "iis.error.reason_phrase": "Timer_MinBytesPerSecond", diff --git a/filebeat/module/kafka/log/test/state-change-1.1.0.log-expected.json b/filebeat/module/kafka/log/test/state-change-1.1.0.log-expected.json index 263ec3871dd..be011b17d23 100644 --- a/filebeat/module/kafka/log/test/state-change-1.1.0.log-expected.json +++ b/filebeat/module/kafka/log/test/state-change-1.1.0.log-expected.json @@ -1,15 +1,15 @@ [ { - "@timestamp": "2018-07-16T10:17:06.489Z", - "fileset.name": "log", - "fileset.module": "kafka", - "kafka.log.message": "Cached leader info PartitionState(controllerEpoch=25, leader=-1, leaderEpoch=15, isr=[10], zkVersion=15, replicas=[10], offlineReplicas=[10]) for partition __consumer_offsets-16 in response to UpdateMetadata request sent by controller 20 epoch 25 with correlation id 8", - "kafka.log.component": "Broker id=30", - "kafka.log.class": "state.change.logger", - "kafka.log.level": "TRACE", - "message": "[2018-07-16 10:17:06,489] TRACE [Broker id=30] Cached leader info PartitionState(controllerEpoch=25, leader=-1, leaderEpoch=15, isr=[10], zkVersion=15, replicas=[10], offlineReplicas=[10]) for partition __consumer_offsets-16 in response to UpdateMetadata request sent by controller 20 epoch 25 with correlation id 8 (state.change.logger)", - "offset": 0, - "input.type": "log", + "@timestamp": "2018-07-16T10:17:06.489Z", + "fileset.module": "kafka", + "fileset.name": "log", + "input.type": "log", + "kafka.log.class": "state.change.logger", + "kafka.log.component": "Broker id=30", + "kafka.log.level": "TRACE", + "kafka.log.message": "Cached leader info PartitionState(controllerEpoch=25, leader=-1, leaderEpoch=15, isr=[10], zkVersion=15, replicas=[10], offlineReplicas=[10]) for partition __consumer_offsets-16 in response to UpdateMetadata request sent by controller 20 epoch 25 with correlation id 8", + "message": "[2018-07-16 10:17:06,489] TRACE [Broker id=30] Cached leader info PartitionState(controllerEpoch=25, leader=-1, leaderEpoch=15, isr=[10], zkVersion=15, replicas=[10], offlineReplicas=[10]) for partition __consumer_offsets-16 in response to UpdateMetadata request sent by controller 20 epoch 25 with correlation id 8 (state.change.logger)", + "offset": 0, "prospector.type": "log" } -] +] \ No newline at end of file diff --git a/filebeat/module/nginx/access/_meta/fields.yml b/filebeat/module/nginx/access/_meta/fields.yml index 38e89be9ddb..a3ea4de961c 100644 --- a/filebeat/module/nginx/access/_meta/fields.yml +++ b/filebeat/module/nginx/access/_meta/fields.yml @@ -119,4 +119,7 @@ type: keyword description: > The city name. - + - name: region_iso_code + type: keyword + description: > + Region ISO code. diff --git a/filebeat/module/nginx/access/test/test.log-expected.json b/filebeat/module/nginx/access/test/test.log-expected.json index 1d8b69e5c70..d169272c44f 100644 --- a/filebeat/module/nginx/access/test/test.log-expected.json +++ b/filebeat/module/nginx/access/test/test.log-expected.json @@ -65,6 +65,7 @@ "nginx.access.geoip.country_iso_code": "DE", "nginx.access.geoip.location.lat": 52.5167, "nginx.access.geoip.location.lon": 13.4, + "nginx.access.geoip.region_iso_code": "DE-BE", "nginx.access.geoip.region_name": "Land Berlin", "nginx.access.http_version": "1.1", "nginx.access.method": "GET", @@ -100,6 +101,7 @@ "nginx.access.geoip.country_iso_code": "DE", "nginx.access.geoip.location.lat": 52.5167, "nginx.access.geoip.location.lon": 13.4, + "nginx.access.geoip.region_iso_code": "DE-BE", "nginx.access.geoip.region_name": "Land Berlin", "nginx.access.http_version": "1.1", "nginx.access.method": "GET", @@ -133,6 +135,7 @@ "nginx.access.geoip.country_iso_code": "US", "nginx.access.geoip.location.lat": 39.772, "nginx.access.geoip.location.lon": -89.6859, + "nginx.access.geoip.region_iso_code": "US-IL", "nginx.access.geoip.region_name": "Illinois", "nginx.access.http_version": "1.1", "nginx.access.method": "GET", diff --git a/filebeat/module/system/auth/_meta/fields.yml b/filebeat/module/system/auth/_meta/fields.yml index 1e94e3dfe08..92fe1689e29 100644 --- a/filebeat/module/system/auth/_meta/fields.yml +++ b/filebeat/module/system/auth/_meta/fields.yml @@ -79,7 +79,10 @@ type: geo_point description: > The longitude and latitude. - + - name: region_iso_code + type: keyword + description: > + Region ISO code. - name: sudo type: group description: > diff --git a/filebeat/module/system/auth/test/test.log-expected.json b/filebeat/module/system/auth/test/test.log-expected.json index 276558f363a..93e792d5a2a 100644 --- a/filebeat/module/system/auth/test/test.log-expected.json +++ b/filebeat/module/system/auth/test/test.log-expected.json @@ -61,6 +61,7 @@ "system.auth.ssh.geoip.country_iso_code": "CN", "system.auth.ssh.geoip.location.lat": 22.5333, "system.auth.ssh.geoip.location.lon": 114.1333, + "system.auth.ssh.geoip.region_iso_code": "CN-44", "system.auth.ssh.geoip.region_name": "Guangdong", "system.auth.ssh.ip": "116.31.116.24", "system.auth.ssh.method": "password", diff --git a/filebeat/module/traefik/access/_meta/fields.yml b/filebeat/module/traefik/access/_meta/fields.yml index 01250f8f706..f205f72a80d 100644 --- a/filebeat/module/traefik/access/_meta/fields.yml +++ b/filebeat/module/traefik/access/_meta/fields.yml @@ -112,6 +112,10 @@ type: keyword description: > The city name. + - name: region_iso_code + type: keyword + description: > + Region ISO code. - name: request_count type: long description: > diff --git a/filebeat/module/traefik/access/test/test.log-expected.json b/filebeat/module/traefik/access/test/test.log-expected.json index d75a0d93a44..623a948a340 100644 --- a/filebeat/module/traefik/access/test/test.log-expected.json +++ b/filebeat/module/traefik/access/test/test.log-expected.json @@ -35,6 +35,7 @@ "traefik.access.geoip.country_iso_code": "DE", "traefik.access.geoip.location.lat": 52.5167, "traefik.access.geoip.location.lon": 13.4, + "traefik.access.geoip.region_iso_code": "DE-BE", "traefik.access.geoip.region_name": "Land Berlin", "traefik.access.http_version": "1.1", "traefik.access.method": "GET", diff --git a/testing/environments/args.yml b/testing/environments/args.yml index db44bdda79b..033b0db0bac 100644 --- a/testing/environments/args.yml +++ b/testing/environments/args.yml @@ -7,4 +7,4 @@ services: args: DOWNLOAD_URL: https://snapshots.elastic.co/downloads ELASTIC_VERSION: 7.0.0-alpha1-SNAPSHOT - CACHE_BUST: 20180501 + CACHE_BUST: 20180723