[adding] kind and client_type to account connect/disconnect events #2351

matthiashanel · 2021-07-07T19:38:56Z

Kind is Client/Leafnode but can take the value of Router/Gateway/JetStream/Account/System in the future.
When kind is Client, then client_type is set to mqtt/websocket/nats
This fixes #2291

Signed-off-by: Matthias Hanel [email protected]

I also did a small refactoring to help with naming. type and kind where used in a mixed way.

connect/disconnect for started/killed leafnode.

> nats --context=sys sub '$SYS.ACCOUNT.>'
14:48:16 Subscribing on $SYS.ACCOUNT.>
[#1] Received on "$SYS.ACCOUNT.AA5C56FAETBTUCYM7NC5BFBYFTKLOABIOIFPQDHO4RUEAPSN3FTY5R4G.SERVER.CONNS"
{"type":"io.nats.server.advisory.v1.account_connections","id":"g5SD2PbNko4bO9PUcbxSvl","timestamp":"2021-07-07T18:48:26.327085Z","server":{"name":"srv-4222","host":"localhost","id":"NB7LOXQAEDQDAYV25OR3VJALLSPUTJK36KEJEDKMXYRJAZCEUXZULUHV","cluster":"cluster-hub","ver":"2.3.2-beta.1","seq":22,"jetstream":true,"time":"2021-07-07T18:48:26.327132Z"},"acc":"AA5C56FAETBTUCYM7NC5BFBYFTKLOABIOIFPQDHO4RUEAPSN3FTY5R4G","conns":0,"leafnodes":1,"total_conns":1}

[#2] Received on "$SYS.ACCOUNT.AA5C56FAETBTUCYM7NC5BFBYFTKLOABIOIFPQDHO4RUEAPSN3FTY5R4G.CONNECT"
{"type":"io.nats.server.advisory.v1.client_connect","id":"g5SD2PbNko4bO9PUcbxSx0","timestamp":"2021-07-07T18:48:26.327101Z","server":{"name":"srv-4222","host":"localhost","id":"NB7LOXQAEDQDAYV25OR3VJALLSPUTJK36KEJEDKMXYRJAZCEUXZULUHV","cluster":"cluster-hub","ver":"2.3.2-beta.1","seq":23,"jetstream":true,"time":"2021-07-07T18:48:26.327143Z"},"client":{"start":"2021-07-07T18:48:26.325393Z","host":"127.0.0.1","id":7,"acc":"AA5C56FAETBTUCYM7NC5BFBYFTKLOABIOIFPQDHO4RUEAPSN3FTY5R4G","user":"UATTSBO5CYOSUJZMZ23F345GUOQFWA5WFC5S2E2QGTKRLR76BJTENNDZ","name":"srv-4242","jwt":"eyJ0eXAiOiJKV1QiLCJhbGciOiJlZDI1NTE5LW5rZXkifQ.eyJqdGkiOiJDS1JJN0hTTUw1SlJYQVZXVFVKN1dMQ0ROWDdaTzZWUEtZNjZYWDMyTkwyU0ZKU05MNEhRIiwiaWF0IjoxNjI0NDc5NTQ0LCJpc3MiOiJBQTVDNTZGQUVUQlRVQ1lNN05DNUJGQllGVEtMT0FCSU9JRlBRREhPNFJVRUFQU04zRlRZNVI0RyIsIm5hbWUiOiJsZWFmIiwic3ViIjoiVUFUVFNCTzVDWU9TVUpaTVoyM0YzNDVHVU9RRldBNVdGQzVTMkUyUUdUS1JMUjc2QkpURU5ORFoiLCJuYXRzIjp7InB1YiI6e30sInN1YiI6e30sInN1YnMiOi0xLCJkYXRhIjotMSwicGF5bG9hZCI6LTEsInR5cGUiOiJ1c2VyIiwidmVyc2lvbiI6Mn19.-SbW7JhA5prumxJyQy7rn-YwY5qcjTk2lOC4iI2hyqYR_1qEYfzJ0j9J5vPiY40kBrrB09is_F1tQFpW_8InDw","issuer_key":"AA5C56FAETBTUCYM7NC5BFBYFTKLOABIOIFPQDHO4RUEAPSN3FTY5R4G","name_tag":"leaf","kind":"Leafnode"}}

[#3] Received on "$SYS.ACCOUNT.ADECCNBUEBWZ727OMBFSN7OMK2FPYRM52TJS25TFQWYS76NPOJBN3KU4.SERVER.CONNS"
 x+                                                                                                                                     buffers
{"type":"io.nats.server.advisory.v1.account_connections","id":"g5SD2PbNko4bO9PUcbxSyF","timestamp":"2021-07-07T18:48:27.327992Z","server":{"name":"srv-4222","host":"localhost","id":"NB7LOXQAEDQDAYV25OR3VJALLSPUTJK36KEJEDKMXYRJAZCEUXZULUHV","cluster":"cluster-hub","ver":"2.3.2-beta.1","seq":25,"jetstream":true,"time":"2021-07-07T18:48:27.32806Z"},"acc":"ADECCNBUEBWZ727OMBFSN7OMK2FPYRM52TJS25TFQWYS76NPOJBN3KU4","conns":2,"leafnodes":1,"total_conns":3}

[#4] Received on "$SYS.ACCOUNT.ADECCNBUEBWZ727OMBFSN7OMK2FPYRM52TJS25TFQWYS76NPOJBN3KU4.CONNECT"
{"type":"io.nats.server.advisory.v1.client_connect","id":"g5SD2PbNko4bO9PUcbxSzU","timestamp":"2021-07-07T18:48:27.328007Z","server":{"name":"srv-4222","host":"localhost","id":"NB7LOXQAEDQDAYV25OR3VJALLSPUTJK36KEJEDKMXYRJAZCEUXZULUHV","cluster":"cluster-hub","ver":"2.3.2-beta.1","seq":26,"jetstream":true,"time":"2021-07-07T18:48:27.328068Z"},"client":{"start":"2021-07-07T18:48:27.3269Z","host":"127.0.0.1","id":9,"acc":"ADECCNBUEBWZ727OMBFSN7OMK2FPYRM52TJS25TFQWYS76NPOJBN3KU4","user":"UAHN57DQWGLOJYEN7E7IWSH4B75SDIUC6YMQVE3G6C2IPOVQ44G63GTM","name":"srv-4242","jwt":"eyJ0eXAiOiJKV1QiLCJhbGciOiJlZDI1NTE5LW5rZXkifQ.eyJqdGkiOiJSVk1PWExSM0tRNTNNRjJYS0NUVkw0NlpCVFpZT0RUWDdFNDVEWUxOUVpON0pJM05MQTRRIiwiaWF0IjoxNjI0NDc5NDgyLCJpc3MiOiJBQUNZSUNPQVFNUTcyRUhUMzVSN0xWNlZGV01JVldGS1dGRTVQMkpKMlRUNjc0RU83REpUVUhNTSIsIm5hbWUiOiJzeXMiLCJzdWIiOiJVQUhONTdEUVdHTE9KWUVON0U3SVdTSDRCNzVTRElVQzZZTVFWRTNHNkMySVBPVlE0NEc2M0dUTSIsIm5hdHMiOnsicHViIjp7fSwic3ViIjp7fSwic3VicyI6LTEsImRhdGEiOi0xLCJwYXlsb2FkIjotMSwiaXNzdWVyX2FjY291bnQiOiJBREVDQ05CVUVCV1o3MjdPTUJGU043T01LMkZQWVJNNTJUSlMyNVRGUVdZUzc2TlBPSkJOM0tVNCIsInR5cGUiOiJ1c2VyIiwidmVyc2lvbiI6Mn19.CD3eqMOyrRw6cDNoKGisHbLtCCw8D9wxtvNbbz1UcZcPRjf2XBtpd1pbVcartxakADiyQAK5Rhx7-TViTie4Dw","issuer_key":"AACYICOAQMQ72EHT35R7LV6VFWMIVWFKWFE5P2JJ2TT674EO7DJTUHMM","name_tag":"sys","kind":"Leafnode"}}

[#5] Received on "$SYS.ACCOUNT.AA5C56FAETBTUCYM7NC5BFBYFTKLOABIOIFPQDHO4RUEAPSN3FTY5R4G.SERVER.CONNS"
{"type":"io.nats.server.advisory.v1.account_connections","id":"g5SD2PbNko4bO9PUcbxT0j","timestamp":"2021-07-07T18:48:36.448612Z","server":{"name":"srv-4222","host":"localhost","id":"NB7LOXQAEDQDAYV25OR3VJALLSPUTJK36KEJEDKMXYRJAZCEUXZULUHV","cluster":"cluster-hub","ver":"2.3.2-beta.1","seq":29,"jetstream":true,"time":"2021-07-07T18:48:36.448645Z"},"acc":"AA5C56FAETBTUCYM7NC5BFBYFTKLOABIOIFPQDHO4RUEAPSN3FTY5R4G","conns":0,"leafnodes":0,"total_conns":0}

[#6] Received on "$SYS.ACCOUNT.AA5C56FAETBTUCYM7NC5BFBYFTKLOABIOIFPQDHO4RUEAPSN3FTY5R4G.DISCONNECT"
{"type":"io.nats.server.advisory.v1.client_disconnect","id":"g5SD2PbNko4bO9PUcbxT1y","timestamp":"2021-07-07T18:48:36.44863Z","server":{"name":"srv-4222","host":"localhost","id":"NB7LOXQAEDQDAYV25OR3VJALLSPUTJK36KEJEDKMXYRJAZCEUXZULUHV","cluster":"cluster-hub","ver":"2.3.2-beta.1","seq":30,"jetstream":true,"time":"2021-07-07T18:48:36.448652Z"},"client":{"start":"2021-07-07T18:48:26.325393Z","host":"127.0.0.1","id":7,"acc":"AA5C56FAETBTUCYM7NC5BFBYFTKLOABIOIFPQDHO4RUEAPSN3FTY5R4G","user":"UATTSBO5CYOSUJZMZ23F345GUOQFWA5WFC5S2E2QGTKRLR76BJTENNDZ","name":"srv-4242","rtt":127000,"stop":"2021-07-07T18:48:36.44863Z","jwt":"eyJ0eXAiOiJKV1QiLCJhbGciOiJlZDI1NTE5LW5rZXkifQ.eyJqdGkiOiJDS1JJN0hTTUw1SlJYQVZXVFVKN1dMQ0ROWDdaTzZWUEtZNjZYWDMyTkwyU0ZKU05MNEhRIiwiaWF0IjoxNjI0NDc5NTQ0LCJpc3MiOiJBQTVDNTZGQUVUQlRVQ1lNN05DNUJGQllGVEtMT0FCSU9JRlBRREhPNFJVRUFQU04zRlRZNVI0RyIsIm5hbWUiOiJsZWFmIiwic3ViIjoiVUFUVFNCTzVDWU9TVUpaTVoyM0YzNDVHVU9RRldBNVdGQzVTMkUyUUdUS1JMUjc2QkpURU5ORFoiLCJuYXRzIjp7InB1YiI6e30sInN1YiI6e30sInN1YnMiOi0xLCJkYXRhIjotMSwicGF5bG9hZCI6LTEsInR5cGUiOiJ1c2VyIiwidmVyc2lvbiI6Mn19.-SbW7JhA5prumxJyQy7rn-YwY5qcjTk2lOC4iI2hyqYR_1qEYfzJ0j9J5vPiY40kBrr
 x+                                                                                                                                     buffers
B09is_F1tQFpW_8InDw","issuer_key":"AA5C56FAETBTUCYM7NC5BFBYFTKLOABIOIFPQDHO4RUEAPSN3FTY5R4G","name_tag":"leaf","kind":"Leafnode"},"sent":{"msgs":0,"bytes":0},"received":{"msgs":0,"bytes":0},"reason":"Client Closed"}

[#7] Received on "$SYS.ACCOUNT.ADECCNBUEBWZ727OMBFSN7OMK2FPYRM52TJS25TFQWYS76NPOJBN3KU4.DISCONNECT"
{"type":"io.nats.server.advisory.v1.client_disconnect","id":"g5SD2PbNko4bO9PUcbxT3D","timestamp":"2021-07-07T18:48:36.448708Z","server":{"name":"srv-4222","host":"localhost","id":"NB7LOXQAEDQDAYV25OR3VJALLSPUTJK36KEJEDKMXYRJAZCEUXZULUHV","cluster":"cluster-hub","ver":"2.3.2-beta.1","seq":31,"jetstream":true,"time":"2021-07-07T18:48:36.448755Z"},"client":{"start":"2021-07-07T18:48:27.3269Z","host":"127.0.0.1","id":9,"acc":"ADECCNBUEBWZ727OMBFSN7OMK2FPYRM52TJS25TFQWYS76NPOJBN3KU4","user":"UAHN57DQWGLOJYEN7E7IWSH4B75SDIUC6YMQVE3G6C2IPOVQ44G63GTM","name":"srv-4242","rtt":97000,"stop":"2021-07-07T18:48:36.448708Z","jwt":"eyJ0eXAiOiJKV1QiLCJhbGciOiJlZDI1NTE5LW5rZXkifQ.eyJqdGkiOiJSVk1PWExSM0tRNTNNRjJYS0NUVkw0NlpCVFpZT0RUWDdFNDVEWUxOUVpON0pJM05MQTRRIiwiaWF0IjoxNjI0NDc5NDgyLCJpc3MiOiJBQUNZSUNPQVFNUTcyRUhUMzVSN0xWNlZGV01JVldGS1dGRTVQMkpKMlRUNjc0RU83REpUVUhNTSIsIm5hbWUiOiJzeXMiLCJzdWIiOiJVQUhONTdEUVdHTE9KWUVON0U3SVdTSDRCNzVTRElVQzZZTVFWRTNHNkMySVBPVlE0NEc2M0dUTSIsIm5hdHMiOnsicHViIjp7fSwic3ViIjp7fSwic3VicyI6LTEsImRhdGEiOi0xLCJwYXlsb2FkIjotMSwiaXNzdWVyX2FjY291bnQiOiJBREVDQ05CVUVCV1o3MjdPTUJGU043T01LMkZQWVJNNTJUSlMyNVRGUVdZUzc2TlBPSkJOM0tVNCIsInR5cGUiOiJ1c2VyIiwidmVyc2lvbiI6Mn19.CD3eqMOyrRw6cDNoKGisHbLtCCw8D9wxtvNbbz1UcZcPRjf2XBtpd1pbVcartxakADiyQAK5Rhx7-TViTie4Dw","issuer_key":"AACYICOAQMQ72EHT35R7LV6VFWMIVWFKWFE5P2JJ2TT674EO7DJTUHMM","name_tag":"sys","kind":"Leafnode"},"sent":{"msgs":2,"bytes":892},"received":{"msgs":2,"bytes":1123},"reason":"Client Closed"}

[#8] Received on "$SYS.ACCOUNT.ADECCNBUEBWZ727OMBFSN7OMK2FPYRM52TJS25TFQWYS76NPOJBN3KU4.SERVER.CONNS"
{"type":"io.nats.server.advisory.v1.account_connections","id":"g5SD2PbNko4bO9PUcbxT4S","timestamp":"2021-07-07T18:48:36.44878Z","server":{"name":"srv-4222","host":"localhost","id":"NB7LOXQAEDQDAYV25OR3VJALLSPUTJK36KEJEDKMXYRJAZCEUXZULUHV","cluster":"cluster-hub","ver":"2.3.2-beta.1","seq":33,"jetstream":true,"time":"2021-07-07T18:48:36.448794Z"},"acc":"ADECCNBUEBWZ727OMBFSN7OMK2FPYRM52TJS25TFQWYS76NPOJBN3KU4","conns":2,"leafnodes":0,"total_conns":2}

^C

kind Leafnode

> json-pretty connect
{
    "client": {
        "acc": "AA5C56FAETBTUCYM7NC5BFBYFTKLOABIOIFPQDHO4RUEAPSN3FTY5R4G",
        "host": "127.0.0.1",
        "id": 7,
        "issuer_key": "AA5C56FAETBTUCYM7NC5BFBYFTKLOABIOIFPQDHO4RUEAPSN3FTY5R4G",
        "jwt": "eyJ0eXAiOiJKV1QiLCJhbGciOiJlZDI1NTE5LW5rZXkifQ.eyJqdGkiOiJDS1JJN0hTTUw1SlJYQVZXVFVKN1dMQ0ROWDdaTzZWUEtZNjZYWDMyTkwyU0ZKU05MNEhRIiwiaWF0IjoxNjI0NDc5NTQ0LCJpc3MiOiJBQTVDNTZGQUVUQlRVQ1lNN05DNUJGQllGVEtMT0FCSU9JRlBRREhPNFJVRUFQU04zRlRZNVI0RyIsIm5hbWUiOiJsZWFmIiwic3ViIjoiVUFUVFNCTzVDWU9TVUpaTVoyM0YzNDVHVU9RRldBNVdGQzVTMkUyUUdUS1JMUjc2QkpURU5ORFoiLCJuYXRzIjp7InB1YiI6e30sInN1YiI6e30sInN1YnMiOi0xLCJkYXRhIjotMSwicGF5bG9hZCI6LTEsInR5cGUiOiJ1c2VyIiwidmVyc2lvbiI6Mn19.-SbW7JhA5prumxJyQy7rn-YwY5qcjTk2lOC4iI2hyqYR_1qEYfzJ0j9J5vPiY40kBrrB09is_F1tQFpW_8InDw",
        "kind": "Leafnode",
        "name": "srv-4242",
        "name_tag": "leaf",
        "start": "2021-07-07T18:48:26.325393Z",
        "user": "UATTSBO5CYOSUJZMZ23F345GUOQFWA5WFC5S2E2QGTKRLR76BJTENNDZ"
    },
    "id": "g5SD2PbNko4bO9PUcbxSx0",
    "server": {
        "cluster": "cluster-hub",
        "host": "localhost",
        "id": "NB7LOXQAEDQDAYV25OR3VJALLSPUTJK36KEJEDKMXYRJAZCEUXZULUHV",
        "jetstream": true,
        "name": "srv-4222",
        "seq": 23,
        "time": "2021-07-07T18:48:26.327143Z",
        "ver": "2.3.2-beta.1"
    },
    "timestamp": "2021-07-07T18:48:26.327101Z",
    "type": "io.nats.server.advisory.v1.client_connect"
}
> json-pretty disconnect
{
    "client": {
        "acc": "ADECCNBUEBWZ727OMBFSN7OMK2FPYRM52TJS25TFQWYS76NPOJBN3KU4",
        "host": "127.0.0.1",
        "id": 9,
        "issuer_key": "AACYICOAQMQ72EHT35R7LV6VFWMIVWFKWFE5P2JJ2TT674EO7DJTUHMM",
        "jwt": "eyJ0eXAiOiJKV1QiLCJhbGciOiJlZDI1NTE5LW5rZXkifQ.eyJqdGkiOiJSVk1PWExSM0tRNTNNRjJYS0NUVkw0NlpCVFpZT0RUWDdFNDVEWUxOUVpON0pJM05MQTRRIiwiaWF0IjoxNjI0NDc5NDgyLCJpc3MiOiJBQUNZSUNPQVFNUTcyRUhUMzVSN0xWNlZGV01JVldGS1dGRTVQMkpKMlRUNjc0RU83REpUVUhNTSIsIm5hbWUiOiJzeXMiLCJzdWIiOiJVQUhONTdEUVdHTE9KWUVON0U3SVdTSDRCNzVTRElVQzZZTVFWRTNHNkMySVBPVlE0NEc2M0dUTSIsIm5hdHMiOnsicHViIjp7fSwic3ViIjp7fSwic3VicyI6LTEsImRhdGEiOi0xLCJwYXlsb2FkIjotMSwiaXNzdWVyX2FjY291bnQiOiJBREVDQ05CVUVCV1o3MjdPTUJGU043T01LMkZQWVJNNTJUSlMyNVRGUVdZUzc2TlBPSkJOM0tVNCIsInR5cGUiOiJ1c2VyIiwidmVyc2lvbiI6Mn19.CD3eqMOyrRw6cDNoKGisHbLtCCw8D9wxtvNbbz1UcZcPRjf2XBtpd1pbVcartxakADiyQAK5Rhx7-TViTie4Dw",
        "kind": "Leafnode",
        "name": "srv-4242",
        "name_tag": "sys",
        "rtt": 97000,
        "start": "2021-07-07T18:48:27.3269Z",
        "stop": "2021-07-07T18:48:36.448708Z",
        "user": "UAHN57DQWGLOJYEN7E7IWSH4B75SDIUC6YMQVE3G6C2IPOVQ44G63GTM"
    },
    "id": "g5SD2PbNko4bO9PUcbxT3D",
    "reason": "Client Closed",
    "received": {
        "bytes": 1123,
        "msgs": 2
    },
    "sent": {
        "bytes": 892,
        "msgs": 2
    },
    "server": {
        "cluster": "cluster-hub",
        "host": "localhost",
        "id": "NB7LOXQAEDQDAYV25OR3VJALLSPUTJK36KEJEDKMXYRJAZCEUXZULUHV",
        "jetstream": true,
        "name": "srv-4222",
        "seq": 31,
        "time": "2021-07-07T18:48:36.448755Z",
        "ver": "2.3.2-beta.1"
    },
    "timestamp": "2021-07-07T18:48:36.448708Z",
    "type": "io.nats.server.advisory.v1.client_disconnect"
}
>

Connect disconnect events for mqtt client

[#34] Received on "$SYS.ACCOUNT.AA5C56FAETBTUCYM7NC5BFBYFTKLOABIOIFPQDHO4RUEAPSN3FTY5R4G.CONNECT"
{"type":"io.nats.server.advisory.v1.client_connect","id":"gS16ho4ZGg4ejyasUrs4ey","timestamp":"2021-07-07T19:20:35.031399Z","server":{"name":"srv-4222","host":"localhost","id":"NBMM7H7WDO3CQML7GTP4WILBFTPBC5TKPBGUVAB6UK5VRT4YBLWMXIIS","cluster":"cluster-hub","ver":"2.3.2-beta.1","seq":47,"jetstream":true,"time":"2021-07-07T19:20:35.031427Z"},"client":{"start":"2021-07-07T19:20:35.030668Z","host":"::1","id":12,"acc":"AA5C56FAETBTUCYM7NC5BFBYFTKLOABIOIFPQDHO4RUEAPSN3FTY5R4G","user":"mqtt","jwt":"eyJ0eXAiOiJKV1QiLCJhbGciOiJlZDI1NTE5LW5rZXkifQ.eyJqdGkiOiIyNUtEVElCUjVURzRKWVlJUkdGT0k1UDc3R1ZWVjZHNjRGSVpBT05SWFJFNUhENjZDVEVRIiwiaWF0IjoxNjI1Njg1NTczLCJpc3MiOiJBQTVDNTZGQUVUQlRVQ1lNN05DNUJGQllGVEtMT0FCSU9JRlBRREhPNFJVRUFQU04zRlRZNVI0RyIsIm5hbWUiOiJiZWFyZXIiLCJzdWIiOiJVQUZDN09JRU82R09FVkdVRFlVUlRMT0FSVzQ2S09HR0tJUVRPVFA3NVdRMlZJWFNUM1JORENFUiIsIm5hdHMiOnsicHViIjp7fSwic3ViIjp7fSwic3VicyI6LTEsImRhdGEiOi0xLCJwYXlsb2FkIjotMSwiYmVhcmVyX3Rva2VuIjp0cnVlLCJhbGxvd2VkX2Nvbm5lY3Rpb25fdHlwZXMiOlsiTVFUVCJdLCJ0eXBlIjoidXNlciIsInZlcnNpb24iOjJ9fQ.HTB6HiD4mHJVwwKb5SDRC-mevRrVc9oXUtnAiy1bm0rHTMhsIH2z1h0dfOvgQcBEXemHGpafv0_P8oQDNB2yBw","issuer_key":"AA5C56FAETBTUCYM7NC5BFBYFTKLOABIOIFPQDHO4RUEAPSN3FTY5R4G","name_tag":"bearer","kind":"Client","type":"mqtt"}}

[#36] Received on "$SYS.ACCOUNT.AA5C56FAETBTUCYM7NC5BFBYFTKLOABIOIFPQDHO4RUEAPSN3FTY5R4G.DISCONNECT"
{"type":"io.nats.server.advisory.v1.client_disconnect","id":"gS16ho4ZGg4ejyasUrs4iA","timestamp":"2021-07-07T19:20:35.033651Z","server":{"name":"srv-4222","host":"localhost","id":"NBMM7H7WDO3CQML7GTP4WILBFTPBC5TKPBGUVAB6UK5VRT4YBLWMXIIS","cluster":"cluster-hub","ver":"2.3.2-beta.1","seq":50,"jetstream":true,"time":"2021-07-07T19:20:35.03366Z"},"client":{"start":"2021-07-07T19:20:35.030668Z","host":"::1","id":12,"acc":"AA5C56FAETBTUCYM7NC5BFBYFTKLOABIOIFPQDHO4RUEAPSN3FTY5R4G","user":"mqtt","stop":"2021-07-07T19:20:35.033651Z","jwt":"eyJ0eXAiOiJKV1QiLCJhbGciOiJlZDI1NTE5LW5rZXkifQ.eyJqdGkiOiIyNUtEVElCUjVURzRKWVlJUkdGT0k1UDc3R1ZWVjZHNjRGSVpBT05SWFJFNUhENjZDVEVRIiwiaWF0IjoxNjI1Njg1NTczLCJpc3MiOiJBQTVDNTZGQUVUQlRVQ1lNN05DNUJGQllGVEtMT0FCSU9JRlBRREhPNFJVRUFQU04zRlRZNVI0RyIsIm5hbWUiOiJiZWFyZXIiLCJzdWIiOiJVQUZDN09JRU82R09FVkdVRFlVUlRMT0FSVzQ2S09HR0tJUVRPVFA3NVdRMlZJWFNUM1JORENFUiIsIm5hdHMiOnsicHViIjp7fSwic3ViIjp7fSwic3VicyI6LTEsImRhdGEiOi0xLCJwYXlsb2FkIjotMSwiYmVhcmVyX3Rva2VuIjp0cnVlLCJhbGxvd2VkX2Nvbm5lY3Rpb25fdHlwZXMiOlsiTVFUVCJdLCJ0eXBlIjoidXNlciIsInZlcnNpb24iOjJ9fQ.HTB6HiD4mHJVwwKb5SDRC-mevRrVc9oXUtnAiy1bm0rHTMhsIH2z1h0dfOvgQcBEXemHGpafv0_P8oQDNB2yBw","issuer_key":"AA5C56FAETBTUCYM7NC5BFBYFTKLOABIOIFPQDHO4RUEAPSN3FTY5R4G","name_tag":"bearer","kind":"Client","type":"mqtt"},"sent":{"msgs":0,"bytes":0},"received":{"msgs":0,"bytes":0},"reason":"Protocol Violation"}

client type "mqtt"

> json-pretty connect
{
    "client": {
        "acc": "AA5C56FAETBTUCYM7NC5BFBYFTKLOABIOIFPQDHO4RUEAPSN3FTY5R4G",
        "host": "::1",
        "id": 12,
        "issuer_key": "AA5C56FAETBTUCYM7NC5BFBYFTKLOABIOIFPQDHO4RUEAPSN3FTY5R4G",
        "jwt": "eyJ0eXAiOiJKV1QiLCJhbGciOiJlZDI1NTE5LW5rZXkifQ.eyJqdGkiOiIyNUtEVElCUjVURzRKWVlJUkdGT0k1UDc3R1ZWVjZHNjRGSVpBT05SWFJFNUhENjZDVEVRIiwiaWF0IjoxNjI1Njg1NTczLCJpc3MiOiJBQTVDNTZGQUVUQlRVQ1lNN05DNUJGQllGVEtMT0FCSU9JRlBRREhPNFJVRUFQU04zRlRZNVI0RyIsIm5hbWUiOiJiZWFyZXIiLCJzdWIiOiJVQUZDN09JRU82R09FVkdVRFlVUlRMT0FSVzQ2S09HR0tJUVRPVFA3NVdRMlZJWFNUM1JORENFUiIsIm5hdHMiOnsicHViIjp7fSwic3ViIjp7fSwic3VicyI6LTEsImRhdGEiOi0xLCJwYXlsb2FkIjotMSwiYmVhcmVyX3Rva2VuIjp0cnVlLCJhbGxvd2VkX2Nvbm5lY3Rpb25fdHlwZXMiOlsiTVFUVCJdLCJ0eXBlIjoidXNlciIsInZlcnNpb24iOjJ9fQ.HTB6HiD4mHJVwwKb5SDRC-mevRrVc9oXUtnAiy1bm0rHTMhsIH2z1h0dfOvgQcBEXemHGpafv0_P8oQDNB2yBw",
        "kind": "Client",
        "name_tag": "bearer",
        "start": "2021-07-07T19:20:35.030668Z",
        "client_type": "mqtt",
        "user": "mqtt"
    },
    "id": "gS16ho4ZGg4ejyasUrs4ey",
    "server": {
        "cluster": "cluster-hub",
        "host": "localhost",
        "id": "NBMM7H7WDO3CQML7GTP4WILBFTPBC5TKPBGUVAB6UK5VRT4YBLWMXIIS",
        "jetstream": true,
        "name": "srv-4222",
        "seq": 47,
        "time": "2021-07-07T19:20:35.031427Z",
        "ver": "2.3.2-beta.1"
    },
    "timestamp": "2021-07-07T19:20:35.031399Z",
    "type": "io.nats.server.advisory.v1.client_connect"
}
> json-pretty disconnect
{
    "client": {
        "acc": "AA5C56FAETBTUCYM7NC5BFBYFTKLOABIOIFPQDHO4RUEAPSN3FTY5R4G",
        "host": "::1",
        "id": 12,
        "issuer_key": "AA5C56FAETBTUCYM7NC5BFBYFTKLOABIOIFPQDHO4RUEAPSN3FTY5R4G",
        "jwt": "eyJ0eXAiOiJKV1QiLCJhbGciOiJlZDI1NTE5LW5rZXkifQ.eyJqdGkiOiIyNUtEVElCUjVURzRKWVlJUkdGT0k1UDc3R1ZWVjZHNjRGSVpBT05SWFJFNUhENjZDVEVRIiwiaWF0IjoxNjI1Njg1NTczLCJpc3MiOiJBQTVDNTZGQUVUQlRVQ1lNN05DNUJGQllGVEtMT0FCSU9JRlBRREhPNFJVRUFQU04zRlRZNVI0RyIsIm5hbWUiOiJiZWFyZXIiLCJzdWIiOiJVQUZDN09JRU82R09FVkdVRFlVUlRMT0FSVzQ2S09HR0tJUVRPVFA3NVdRMlZJWFNUM1JORENFUiIsIm5hdHMiOnsicHViIjp7fSwic3ViIjp7fSwic3VicyI6LTEsImRhdGEiOi0xLCJwYXlsb2FkIjotMSwiYmVhcmVyX3Rva2VuIjp0cnVlLCJhbGxvd2VkX2Nvbm5lY3Rpb25fdHlwZXMiOlsiTVFUVCJdLCJ0eXBlIjoidXNlciIsInZlcnNpb24iOjJ9fQ.HTB6HiD4mHJVwwKb5SDRC-mevRrVc9oXUtnAiy1bm0rHTMhsIH2z1h0dfOvgQcBEXemHGpafv0_P8oQDNB2yBw",
        "kind": "Client",
        "name_tag": "bearer",
        "start": "2021-07-07T19:20:35.030668Z",
        "stop": "2021-07-07T19:20:35.033651Z",
        "client_type": "mqtt",
        "user": "mqtt"
    },
    "id": "gS16ho4ZGg4ejyasUrs4iA",
    "reason": "Protocol Violation",
    "received": {
        "bytes": 0,
        "msgs": 0
    },
    "sent": {
        "bytes": 0,
        "msgs": 0
    },
    "server": {
        "cluster": "cluster-hub",
        "host": "localhost",
        "id": "NBMM7H7WDO3CQML7GTP4WILBFTPBC5TKPBGUVAB6UK5VRT4YBLWMXIIS",
        "jetstream": true,
        "name": "srv-4222",
        "seq": 50,
        "time": "2021-07-07T19:20:35.03366Z",
        "ver": "2.3.2-beta.1"
    },
    "timestamp": "2021-07-07T19:20:35.033651Z",
    "type": "io.nats.server.advisory.v1.client_disconnect"
}

Kind is Client/Leafnode but can take the value of Router/Gateway/JetStream/Account/System in the future. When kind is Client, then client_type is set to mqtt/websocket/nats This fixes #2291 Signed-off-by: Matthias Hanel <[email protected]>

ripienaar · 2021-07-07T19:46:01Z

For all the ones with io.nats types also send updates for the schemas please. They are in jsm.go

kozlovic

small changes, but otherwise LGTM

server/client.go

Signed-off-by: Matthias Hanel <[email protected]>

kozlovic

LGTM

Signed-off-by: Matthias Hanel <[email protected]>

kozlovic

LGTM

matthiashanel requested a review from kozlovic July 7, 2021 19:38

kozlovic requested changes Jul 7, 2021

View reviewed changes

server/client.go Outdated Show resolved Hide resolved

server/client.go Outdated Show resolved Hide resolved

server/client.go Outdated Show resolved Hide resolved

review comments

5575015

Signed-off-by: Matthias Hanel <[email protected]>

kozlovic approved these changes Jul 7, 2021

View reviewed changes

adding kind/client_type to other places where client info is created

d050c5c

Signed-off-by: Matthias Hanel <[email protected]>

kozlovic approved these changes Jul 7, 2021

View reviewed changes

matthiashanel merged commit c68ffe5 into main Jul 7, 2021

matthiashanel deleted the connection-event branch July 7, 2021 21:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[adding] kind and client_type to account connect/disconnect events #2351

[adding] kind and client_type to account connect/disconnect events #2351

matthiashanel commented Jul 7, 2021

ripienaar commented Jul 7, 2021

kozlovic left a comment

kozlovic left a comment

kozlovic left a comment

[adding] kind and client_type to account connect/disconnect events #2351

[adding] kind and client_type to account connect/disconnect events #2351

Conversation

matthiashanel commented Jul 7, 2021

ripienaar commented Jul 7, 2021

kozlovic left a comment

Choose a reason for hiding this comment

kozlovic left a comment

Choose a reason for hiding this comment

kozlovic left a comment

Choose a reason for hiding this comment