@@ -698,6 +698,13 @@ func (g *PigstyConfigGenerator) getFuncMap() template.FuncMap {
698698 }
699699 return basePkgs + " flamegraph chkconfig"
700700 },
701+ "getDebNodePackage1" : func () string {
702+ // u24 temporarily disables tcpdump
703+ if g .osCode == "u24" {
704+ return "lz4 unzip bzip2 zlib1g pv jq git ncdu make patch bash lsof wget uuid tuned nvme-cli numactl sysstat iotop htop rsync acl chrony" // tcpdump
705+ }
706+ return g .constants .DEBCommonPkg [3 ]
707+ },
701708 "getNodePackage2" : func () string {
702709 // Handle OS-specific package differences
703710 if g .isRPM () {
@@ -787,7 +794,7 @@ func GetConfigConstants() *ConfigConstants {
787794 // 0: infra-package
788795 "nginx dnsmasq etcd haproxy vip-manager node_exporter keepalived_exporter pg_exporter pgbackrest_exporter redis_exporter redis minio mcli pig" ,
789796 // 1: infra-addons
790- "grafana grafana-plugins loki logcli vector promtail prometheus alertmanager pushgateway blackbox_exporter nginx_exporter pev2 certbot python3-certbot-nginx" ,
797+ "grafana grafana-plugins grafana-victorialogs-ds victoria-logs vlogscli vector prometheus alertmanager pushgateway blackbox_exporter nginx_exporter pev2 certbot python3-certbot-nginx" ,
791798 // 2: extra-modules
792799 "docker-ce docker-compose-plugin ferretdb2 duckdb restic juicefs vray grafana-infinity-ds" ,
793800 // 3: node-package1
@@ -802,7 +809,7 @@ func GetConfigConstants() *ConfigConstants {
802809 // 0: infra-package
803810 "nginx dnsmasq etcd haproxy vip-manager node-exporter keepalived-exporter pg-exporter pgbackrest-exporter redis-exporter redis minio mcli pig" ,
804811 // 1: infra-addons
805- "grafana grafana-plugins loki logcli vector promtail prometheus alertmanager pushgateway blackbox-exporter nginx-exporter pev2 certbot python3-certbot-nginx" ,
812+ "grafana grafana-plugins grafana-victorialogs-ds victoria-logs vlogscli vector prometheus alertmanager pushgateway blackbox-exporter nginx-exporter pev2 certbot python3-certbot-nginx" ,
806813 // 2: extra-modules
807814 "docker-ce docker-compose-plugin ferretdb2 duckdb restic juicefs vray grafana-infinity-ds" ,
808815 // 3: node-package1
@@ -900,11 +907,11 @@ repo_extra_packages_default: [ pgsql-main ]
900907node_packages_default:
901908 - lz4,unzip,bzip2,pv,jq,git,ncdu,make,patch,bash,lsof,wget,uuid,tuned,nvme-cli,numactl,sysstat,iotop,htop,rsync,tcpdump
902909 - python3,python3-pip,socat,lrzsz,net-tools,ipvsadm,telnet,ca-certificates,openssl,keepalived,etcd,haproxy,chrony,pig
903- - zlib,yum,audit,bind-utils,readline,vim-minimal,node_exporter,grubby,openssh-server,openssh-clients,chkconfig
910+ - zlib,yum,audit,bind-utils,readline,vim-minimal,node_exporter,grubby,openssh-server,openssh-clients,chkconfig,vector
904911
905912# default infra packages to be installed (if ` + "`infra_packages`" + ` is not explicitly set)
906913infra_packages_default:
907- - grafana,loki,logcli ,prometheus,alertmanager,pushgateway,grafana-plugins,restic,certbot,python3-certbot-nginx
914+ - grafana,grafana-victorialogs-ds,victoria-logs,vlogscli ,prometheus,alertmanager,pushgateway,grafana-plugins,restic,certbot,python3-certbot-nginx
908915 - node_exporter,blackbox_exporter,nginx_exporter,pg_exporter,pev2,nginx,dnsmasq,ansible,etcd,python3-requests,redis,mcli
909916
910917# postgres home dir in various mode
@@ -993,10 +1000,11 @@ package_map:
9931000 sealos: "sealos"
9941001 kubernetes: "kubeadm kubelet kubectl"
9951002 docker: "docker-ce docker-compose-plugin"
996- infra-extra: "victoria-metrics victoria-metrics-cluster vmutils grafana-victoriametrics-ds victoria-logs vlogscli vlagent grafana-victorialogs-ds rclone mysqld_exporter mongodb_exporter kafka_exporter"
997- victoria: "victoria-metrics victoria-metrics-cluster vmutils grafana-victoriametrics-ds victoria-logs vlogscli vlagent grafana-victorialogs-ds"
998- vmetrics: "victoria-metrics victoria-metrics-cluster vmutils grafana-victoriametrics-ds"
999- vlogs: "victoria-logs vlogscli vlagent grafana-victorialogs-ds"
1003+ infra-extra: "victoria-metrics victoria-metrics-cluster vmutils grafana-victoriametrics-ds victoria-logs vlogscli vlagent victoria-traces grafana-victorialogs-ds rclone mysqld_exporter mongodb_exporter kafka_exporter"
1004+ victoria: "victoria-metrics victoria-metrics-cluster vmutils grafana-victoriametrics-ds victoria-logs vlogscli vlagent victoria-traces grafana-victorialogs-ds"
1005+ vmetrics: "victoria-metrics victoria-metrics-cluster vmutils"
1006+ vlogs: "victoria-logs vlogscli vlagent"
1007+ vtraces: "victoria-traces"
10001008 tigerbeetle: "tigerbeetle"
10011009 clickhouse: "clickhouse-server clickhouse-client clickhouse-common-static"
10021010
@@ -1048,13 +1056,13 @@ repo_extra_packages_default: [ pgsql-main ]
10481056
10491057# default node packages to be installed (if ` + "`node_default_packages`" + ` is not explicitly set)
10501058node_packages_default:
1051- - lz4,unzip,bzip2,pv,jq,git,ncdu,make,patch,bash,lsof,wget,uuid,tuned,nvme-cli,numactl,sysstat,iotop,htop,rsync,tcpdump
1059+ - lz4,unzip,bzip2,pv,jq,git,ncdu,make,patch,bash,lsof,wget,uuid,tuned,nvme-cli,numactl,sysstat,iotop,htop,rsync{{ if ne .OSCode "u24" }} ,tcpdump{{ else }} #tcpdump{{ end }}
10521060 - python3,python3-pip,socat,lrzsz,net-tools,ipvsadm,telnet,ca-certificates,openssl,keepalived,etcd,haproxy,chrony,pig
1053- - zlib1g,acl,{{ getDNSPackage }},libreadline-dev,vim-tiny,node-exporter,openssh-server,openssh-client
1061+ - zlib1g,acl,{{ getDNSPackage }},libreadline-dev,vim-tiny,node-exporter,openssh-server,openssh-client,vector
10541062
10551063# default infra packages to be installed (if ` + "`infra_packages`" + ` is not explicitly set)
10561064infra_packages_default:
1057- - grafana,grafana-plugins,loki,logcli ,prometheus,alertmanager,pushgateway,restic,certbot,python3-certbot-nginx
1065+ - grafana,grafana-plugins,grafana-victorialogs-ds,victoria-logs,vlogscli ,prometheus,alertmanager,pushgateway,restic,certbot,python3-certbot-nginx
10581066 - node-exporter,blackbox-exporter,nginx-exporter,pg-exporter,pev2,nginx,dnsmasq,ansible,etcd,python3-requests,redis,mcli
10591067
10601068# postgres home dir in various mode
@@ -1116,7 +1124,7 @@ package_map:
11161124 infra-package: "{{ index .Constants.DEBCommonPkg 0 }}"
11171125 infra-addons: "{{ index .Constants.DEBCommonPkg 1 }}"
11181126 extra-modules: "{{ index .Constants.DEBCommonPkg 2 }}"
1119- node-package1: "{{ index .Constants.DEBCommonPkg 3 }}"
1127+ node-package1: "{{ getDebNodePackage1 }}"{{ if eq .OSCode "u24" }} #tcpdump{{ end }}
11201128 node-package2: "{{ getNodePackage2 }}"
11211129 pgsql-utility: "{{ index .Constants.DEBCommonPkg 5 }}"
11221130
@@ -1136,10 +1144,11 @@ package_map:
11361144 sealos: "sealos"
11371145 kubernetes: "kubeadm kubelet kubectl"
11381146 docker: "docker-ce docker-compose-plugin"
1139- infra-extra: "victoria-metrics victoria-metrics-cluster vmutils grafana-victoriametrics-ds victoria-logs vlogscli vlagent grafana-victorialogs-ds rclone mysqld-exporter mongodb-exporter kafka-exporter"
1140- victoria: "victoria-metrics victoria-metrics-cluster vmutils grafana-victoriametrics-ds victoria-logs vlogscli vlagent grafana-victorialogs-ds"
1141- vmetrics: "victoria-metrics victoria-metrics-cluster vmutils grafana-victoriametrics-ds"
1142- vlogs: "victoria-logs vlogscli vlagent grafana-victorialogs-ds"
1147+ infra-extra: "victoria-metrics victoria-metrics-cluster vmutils grafana-victoriametrics-ds victoria-logs vlogscli vlagent victoria-traces grafana-victorialogs-ds rclone mysqld_exporter mongodb_exporter kafka_exporter"
1148+ victoria: "victoria-metrics victoria-metrics-cluster vmutils grafana-victoriametrics-ds victoria-logs vlogscli vlagent victoria-traces grafana-victorialogs-ds"
1149+ vmetrics: "victoria-metrics victoria-metrics-cluster vmutils"
1150+ vlogs: "victoria-logs vlogscli vlagent"
1151+ vtraces: "victoria-traces"
11431152 tigerbeetle: "tigerbeetle"
11441153 clickhouse: "clickhouse-server clickhouse-client clickhouse-common-static"
11451154
0 commit comments