Skip to content

Commit 5657c4b

Browse files
committed
routine extension udpate
1 parent bdd8c18 commit 5657c4b

File tree

3 files changed

+54
-24
lines changed

3 files changed

+54
-24
lines changed

cli/confgen.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -700,16 +700,16 @@ func (g *PigstyConfigGenerator) getFuncMap() template.FuncMap {
700700
},
701701
"getNodePackage1": func() string {
702702
// el10 doesn't have flamegraph package
703-
basePkgs := "lz4 unzip bzip2 zlib yum pv jq git ncdu make patch bash lsof wget uuid tuned nvme-cli numactl grubby sysstat iotop htop rsync tcpdump perf"
703+
basePkgs := "lz4 unzip bzip2 zlib yum pv jq git ncdu make patch bash lsof wget tuned nvme-cli numactl grubby sysstat iotop htop rsync tcpdump perf"
704704
if g.osCode == "el10" {
705-
return basePkgs + " chkconfig"
705+
return basePkgs + " chkconfig uv"
706706
}
707-
return basePkgs + " flamegraph chkconfig"
707+
return basePkgs + " flamegraph chkconfig uv"
708708
},
709709
"getDebNodePackage1": func() string {
710710
// u24 temporarily disables tcpdump
711711
if g.osCode == "u24" {
712-
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
712+
return "lz4 unzip bzip2 zlib1g pv jq git ncdu make patch bash lsof wget tuned nvme-cli numactl sysstat iotop htop rsync acl chrony cron uv" // tcpdump
713713
}
714714
return g.constants.DEBCommonPkg[3]
715715
},
@@ -821,13 +821,13 @@ func GetConfigConstants() *ConfigConstants {
821821
// 0: infra-package
822822
"nginx dnsmasq etcd haproxy vip-manager node_exporter keepalived_exporter pg_exporter pgbackrest_exporter redis_exporter redis minio mcli pig",
823823
// 1: infra-addons
824-
"grafana grafana-plugins grafana-victoriametrics-ds grafana-victorialogs-ds victoria-metrics victoria-logs victoria-traces vlogscli vmutils vector alertmanager uv",
824+
"grafana grafana-plugins grafana-victoriametrics-ds grafana-victorialogs-ds victoria-metrics victoria-logs victoria-traces vlogscli vmutils vector alertmanager",
825825
// 2: extra-modules
826826
"blackbox_exporter nginx_exporter pev2 certbot python3-certbot-nginx docker-ce docker-compose-plugin ferretdb2 duckdb restic juicefs vray grafana-infinity-ds opencode",
827827
// 3: node-package1
828-
"lz4 unzip bzip2 zlib yum pv jq git ncdu make patch bash lsof wget uuid tuned nvme-cli numactl grubby sysstat iotop htop rsync tcpdump perf flamegraph chkconfig",
828+
"lz4 unzip bzip2 zlib yum pv jq git ncdu make patch bash lsof wget tuned nvme-cli numactl grubby sysstat iotop htop rsync tcpdump perf flamegraph chkconfig uv",
829829
// 4: node-package2
830-
"netcat socat ftp lrzsz net-tools ipvsadm bind-utils telnet audit ca-certificates readline vim-minimal keepalived chrony openssl openssh-server openssh-clients",
830+
"netcat socat ftp net-tools ipvsadm bind-utils telnet audit ca-certificates readline vim-minimal keepalived openssl openssh-server openssh-clients chrony cronie",
831831
// 5: pgsql-utility
832832
"patroni patroni-etcd pgbouncer pgbackrest pgbadger pg_timetable pgFormatter pg_filedump pgxnclient timescaledb-tools timescaledb-event-streamer",
833833
},
@@ -836,13 +836,13 @@ func GetConfigConstants() *ConfigConstants {
836836
// 0: infra-package
837837
"nginx dnsmasq etcd haproxy vip-manager node-exporter keepalived-exporter pg-exporter pgbackrest-exporter redis-exporter redis minio mcli pig",
838838
// 1: infra-addons
839-
"grafana grafana-plugins grafana-victoriametrics-ds grafana-victorialogs-ds victoria-metrics victoria-logs victoria-traces vlogscli vmutils vector alertmanager uv",
839+
"grafana grafana-plugins grafana-victoriametrics-ds grafana-victorialogs-ds victoria-metrics victoria-logs victoria-traces vlogscli vmutils vector alertmanager",
840840
// 2: extra-modules
841841
"blackbox-exporter nginx-exporter pev2 certbot python3-certbot-nginx docker-ce docker-compose-plugin ferretdb2 duckdb restic juicefs vray grafana-infinity-ds opencode",
842842
// 3: node-package1
843-
"lz4 unzip bzip2 zlib1g pv jq git ncdu make patch bash lsof wget uuid tuned nvme-cli numactl sysstat iotop htop rsync tcpdump acl chrony",
843+
"lz4 unzip bzip2 zlib1g pv jq git ncdu make patch bash lsof wget tuned nvme-cli numactl sysstat iotop htop rsync tcpdump acl chrony cron uv",
844844
// 4: node-package2
845-
"netcat-openbsd socat lrzsz net-tools ipvsadm dnsutils telnet ca-certificates libreadline-dev vim-tiny keepalived openssl openssh-server openssh-client",
845+
"netcat-openbsd socat net-tools ipvsadm dnsutils telnet ca-certificates libreadline-dev vim-tiny keepalived openssl openssh-server openssh-client",
846846
// 5: pgsql-utility
847847
"patroni python3-etcd pgbouncer pgbackrest pgbadger pg-timetable pgformatter postgresql-filedump pgxnclient timescaledb-tools timescaledb-event-streamer",
848848
},
@@ -932,13 +932,13 @@ repo_extra_packages_default: [ pgsql-main ]
932932
933933
# default node packages to be installed (if ` + "`node_default_packages`" + ` is not explicitly set)
934934
node_packages_default:
935-
- lz4,unzip,bzip2,pv,jq,git,ncdu,make,patch,bash,lsof,wget,uuid,tuned,nvme-cli,numactl,sysstat,iotop,htop,rsync,tcpdump
936-
- python3,socat,lrzsz,net-tools,ipvsadm,telnet,ca-certificates,openssl,keepalived,etcd,haproxy,chrony,pig
935+
- lz4,unzip,bzip2,pv,jq,git,ncdu,make,patch,bash,lsof,wget,tuned,nvme-cli,numactl,sysstat,iotop,htop,rsync,tcpdump
936+
- python3,socat,net-tools,ipvsadm,telnet,ca-certificates,openssl,keepalived,etcd,haproxy,chrony,cronie,pig,uv
937937
- zlib,yum,audit,bind-utils,readline,vim-minimal,node_exporter,grubby,openssh-server,openssh-clients,chkconfig,vector
938938
939939
# default infra packages to be installed (if ` + "`infra_packages`" + ` is not explicitly set)
940940
infra_packages_default:
941-
- grafana,grafana-plugins,grafana-victorialogs-ds,grafana-victoriametrics-ds,victoria-metrics,victoria-logs,victoria-traces,vmutils,vlogscli,alertmanager,uv
941+
- grafana,grafana-plugins,grafana-victorialogs-ds,grafana-victoriametrics-ds,victoria-metrics,victoria-logs,victoria-traces,vmutils,vlogscli,alertmanager
942942
- node_exporter,blackbox_exporter,nginx_exporter,pg_exporter,pev2,nginx,dnsmasq,ansible,etcd,python3-requests,redis,mcli,restic,certbot,python3-certbot-nginx
943943
944944
# postgres home dir in various mode
@@ -1079,13 +1079,13 @@ repo_extra_packages_default: [ pgsql-main ]
10791079
10801080
# default node packages to be installed (if ` + "`node_default_packages`" + ` is not explicitly set)
10811081
node_packages_default:
1082-
- 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 }}
1083-
- python3,socat,lrzsz,net-tools,ipvsadm,telnet,ca-certificates,openssl,keepalived,etcd,haproxy,chrony,pig
1082+
- lz4,unzip,bzip2,pv,jq,git,ncdu,make,patch,bash,lsof,wget,tuned,nvme-cli,numactl,sysstat,iotop,htop,rsync{{ if ne .OSCode "u24" }},tcpdump{{ else }} #tcpdump{{ end }}
1083+
- python3,socat,net-tools,ipvsadm,telnet,ca-certificates,openssl,keepalived,etcd,haproxy,chrony,cron,pig,uv
10841084
- zlib1g,acl,{{ getDNSPackage }},libreadline-dev,vim-tiny,node-exporter,openssh-server,openssh-client,vector
10851085
10861086
# default infra packages to be installed (if ` + "`infra_packages`" + ` is not explicitly set)
10871087
infra_packages_default:
1088-
- grafana,grafana-plugins,grafana-victorialogs-ds,grafana-victoriametrics-ds,victoria-metrics,victoria-logs,victoria-traces,vmutils,vlogscli,alertmanager,uv
1088+
- grafana,grafana-plugins,grafana-victorialogs-ds,grafana-victoriametrics-ds,victoria-metrics,victoria-logs,victoria-traces,vmutils,vlogscli,alertmanager
10891089
- node-exporter,blackbox-exporter,nginx-exporter,pg-exporter,pev2,nginx,dnsmasq,ansible,etcd,python3-requests,redis,mcli,restic,certbot,python3-certbot-nginx
10901090
10911091
# postgres home dir in various mode

0 commit comments

Comments
 (0)