Commit Graph

370 Commits

Author SHA1 Message Date
Grant Limberg b92fb93f8f Merge branch 'dev' into gl/ctl-pubsub 2025-10-06 16:55:28 -07:00
Adam Ierymenko a28a6d1bf5 Build fix. 2025-09-13 11:07:36 -04:00
Adam Ierymenko 5db2abab73 Make nonfree the official build for Linux. 2025-09-05 17:49:10 -04:00
Grant Limberg 195d5b47f0 Merge branch 'adam/1.16' into gl/ctl-pubsub 2025-09-01 16:47:55 -07:00
Grant Limberg 7f3b15011e Update central controller build to use CMake + conda
Muuuuch easier to use external dependencies now

Also tried out conan and vcpkg.   Ran into dependency issues when solving for packages to install with conan.

vcpkg is just obtuse as all hell to install and not easy to integrate
2025-08-27 16:23:02 -07:00
Adam Ierymenko 6e6fc9a704 Add conditional compilation of controller. 2025-08-21 09:55:08 -04:00
Grant Limberg e822811f29 reorganize rustybits into a single library with smeeclient behind the ztcontroller feature flag 2025-08-05 15:52:58 -07:00
Adam Ierymenko f319078694 Merge github/dev 2025-08-05 11:03:59 -04:00
Adam Ierymenko 3eb7ed2892 Move controller/ into nonfree/controller and update references 2025-07-30 14:18:36 -04:00
Grant Limberg 4aea588eef fixes for otel in non-controller build 2025-07-16 12:57:18 -07:00
Grant Limberg 0ae551a970 more fun setting up tracing 2025-07-14 20:32:34 -07:00
Grant Limberg 8e733ff0da definition fix 2025-07-14 17:50:44 -07:00
Grant Limberg 8e5522647a build updates 2025-07-14 10:17:52 -07:00
Grant Limberg f71a85a675 fix otel api-only header dir 2025-07-12 13:35:45 -07:00
Grant Limberg 2c2574e182 instantiate and configure otel for controllers 2025-07-12 12:12:25 -07:00
Grant Limberg 5c3daca2a0 only build otlp stuff for central controllers 2025-07-11 14:47:58 -07:00
Grant Limberg 7f835b414a include the otel header-only part directly for ease of use 2025-07-11 13:12:13 -07:00
Grant Limberg 8895ad182f fix linking on linux 2025-07-11 11:20:43 -07:00
Grant Limberg 3784b66cdb clean updates 2025-07-11 11:15:10 -07:00
Grant Limberg 0c7afe3d0a add otel target to zerotier-one dependency in linux makefile 2025-07-11 11:12:58 -07:00
Grant Limberg 478cd2840b add otel to mac & linux builds
Off by default.  set `ZT_OTEL=1` to enable
2025-07-11 11:07:47 -07:00
Adam Ierymenko 69de477d0b Merge branch 'dev' into dev-extosdep
# Conflicts:
#	controller/DB.hpp
#	controller/DBMirrorSet.cpp
#	controller/DBMirrorSet.hpp
#	controller/EmbeddedNetworkController.cpp
#	controller/FileDB.cpp
#	controller/FileDB.hpp
#	controller/LFDB.cpp
#	controller/LFDB.hpp
#	controller/PostgreSQL.cpp
#	controller/PostgreSQL.hpp
#	node/Metrics.cpp
#	node/Metrics.hpp
#	osdep/EthernetTap.cpp
#	osdep/Http.hpp
#	osdep/ManagedRoute.cpp
#	service/OneService.cpp
2025-07-03 14:14:04 -04:00
Grant Limberg ee73ac1a74 update makefile for multi-arch controller-v2 docker build 2025-06-20 14:49:40 -07:00
Grant Limberg 169250d484 update makefile for multi-arch controller-v2 docker build 2025-06-20 14:48:18 -07:00
Grant Limberg 35d37559c8 v2controller docker target on mac 2025-05-01 12:57:54 -07:00