diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c50bd01d..07a900fa5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,39 @@ ## What's New * Revert dial error messages to what sdks are expecting. Add error codes so future sdks don't have to parse error text +* Add router events +* Allow filters with no predicate if sort or paging clauses are provided + * Ex: instead of `true limit 5` you could have just `limit 5`. Or instead of `true sort by name` you could have `sort by name` + +## Router events + +To enable: + +``` +events: + jsonLogger: + subscriptions: + - type: fabric.routers +``` + +Example JSON output: + +``` +{ + "namespace": "fabric.routers", + "event_type": "router-online", + "timestamp": "2021-04-22T11:26:31.99299884-04:00", + "router_id": "JAoyjafljO", + "router_online": true +} +{ + "namespace": "fabric.routers", + "event_type": "router-offline", + "timestamp": "2021-04-22T11:26:41.335114358-04:00", + "router_id": "JAoyjafljO", + "router_online": false +} +``` # Release 0.19.11 diff --git a/etc/ctrl.with.edge.yml b/etc/ctrl.with.edge.yml index 589717a9d..bae3eeb92 100644 --- a/etc/ctrl.with.edge.yml +++ b/etc/ctrl.with.edge.yml @@ -41,7 +41,7 @@ mgmt: # the number of milliseconds to wait before a hello synchronization fails and closes the connection (30ms to 60000ms, default: 1000ms) #connectTimeoutMs: 3000 -metrics: +#metrics: #file: #path: /tmp/ziti-controller-metrics.log #maxsizemb: 100:wq @@ -55,6 +55,7 @@ metrics: #events: # jsonLogger: # subscriptions: +# - type: fabric.routers # - type: fabric.terminators # - type: metrics # sourceFilter: .* diff --git a/go.mod b/go.mod index 9d23c8c24..8c589009d 100644 --- a/go.mod +++ b/go.mod @@ -27,10 +27,10 @@ require ( github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19 github.com/michaelquigley/pfxlog v0.3.7 - github.com/openziti/edge v0.19.85 - github.com/openziti/fabric v0.16.54 - github.com/openziti/foundation v0.15.48 - github.com/openziti/sdk-golang v0.15.42 + github.com/openziti/edge v0.19.90 + github.com/openziti/fabric v0.16.56 + github.com/openziti/foundation v0.15.49 + github.com/openziti/sdk-golang v0.15.43 github.com/pborman/uuid v1.2.0 github.com/pkg/errors v0.9.1 github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 diff --git a/go.sum b/go.sum index b86a0338b..5112b2431 100644 --- a/go.sum +++ b/go.sum @@ -614,14 +614,14 @@ github.com/openziti/bbolt v1.3.6-0.20210317142109-547da822475e h1:ST9+54UtCr96S5 github.com/openziti/bbolt v1.3.6-0.20210317142109-547da822475e/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= github.com/openziti/dilithium v0.3.3 h1:PLgQ6PMNLSTzCFbX/h98cmudgz/cU6TmjdSv5NAPD8k= github.com/openziti/dilithium v0.3.3/go.mod h1:vsCjI2AU/hon9e+dLhUFbCNGesJDj2ASgkySOcpmvjo= -github.com/openziti/edge v0.19.85 h1:2yO61q68Eqn51ZkNue/95VXGYf5RconSCFREf9g3URw= -github.com/openziti/edge v0.19.85/go.mod h1:t5WXvNDvA51sYvbbun6DohILocZcPwnjRRorhsXVxz0= -github.com/openziti/fabric v0.16.54 h1:jfuAv5p73Uu7E2L26TBFoO+ZF5mzeAHgA9CSU8d+rfE= -github.com/openziti/fabric v0.16.54/go.mod h1:fb5zFkB3YQxusAmsQLKKzEk7MmPodqDkqmOVTB+J3eE= -github.com/openziti/foundation v0.15.48 h1:NnL/xY684XeFiLBi5z0+uKf2tpPhlClbMeVmUQPF8Jo= -github.com/openziti/foundation v0.15.48/go.mod h1:NnSBTp9ZkcYsv6nYxZR0/NzoHfkIo6tjpBHDvBsPFqw= -github.com/openziti/sdk-golang v0.15.42 h1:uXwEVn/PRRfmF/D9/xLqT3pcQIFeQDO3/UgGG7wN1yA= -github.com/openziti/sdk-golang v0.15.42/go.mod h1:yo85e6HhAL1+PrRjgrsL/ZgkyAcdqVxy4Ws1UMrogss= +github.com/openziti/edge v0.19.90 h1:hMNoyVsw2VaYikfCLwvlHJnzTCCUiZtKJ7Zw2lpPPhg= +github.com/openziti/edge v0.19.90/go.mod h1:PFQ6g4shFA4WWUQW5O6DZBDyxW51bSkQyUFtGbz1feM= +github.com/openziti/fabric v0.16.56 h1:qUYmU3EvppPzivpHo8FxjbyTupMeBauDxlwQG2eAh6c= +github.com/openziti/fabric v0.16.56/go.mod h1:Okz2xHYivh3N1UovAcQt0xSx2Kb8QWA0VpQ20zB2xD4= +github.com/openziti/foundation v0.15.49 h1:dXyqQFD4myl+ILCnj4+024peoT3RR1UTZZx974v6wlU= +github.com/openziti/foundation v0.15.49/go.mod h1:NnSBTp9ZkcYsv6nYxZR0/NzoHfkIo6tjpBHDvBsPFqw= +github.com/openziti/sdk-golang v0.15.43 h1:Lz65VocDRtdt0aR0JmK767UkRvtEz4Wm4PG4/bvJuDM= +github.com/openziti/sdk-golang v0.15.43/go.mod h1:UN6ECAN/VdwApuIQg8+zudTL5Si4PgbN73xhQXKc4o0= github.com/oracle/oci-go-sdk v24.2.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888= github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI= github.com/orcaman/concurrent-map v0.0.0-20210106121528-16402b402231 h1:fa50YL1pzKW+1SsBnJDOHppJN9stOEwS+CRWyUtyYGU=