Skip to content

Commit dd17ae6

Browse files
committed
Release 2.6.0
2 parents 2cf0f06 + f0736fa commit dd17ae6

File tree

8 files changed

+122
-83
lines changed

8 files changed

+122
-83
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
- uses: actions/setup-go@v4
2020
with:
21-
go-version: '1.20.7'
21+
go-version: '1.20.11'
2222

2323
- name: Ensure linux agent compiles
2424
run: |

agent/tasks_windows.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,12 +175,17 @@ func (a *Agent) CreateSchedTask(st SchedTask) (bool, error) {
175175
var tasktrigger taskmaster.TaskTrigger
176176

177177
var now = time.Now()
178-
if st.Trigger == "manual" {
178+
switch st.Trigger {
179+
case "manual":
179180
tasktrigger = taskmaster.TaskTrigger{
180181
Enabled: st.Enabled,
181182
StartBoundary: now,
182183
}
183-
} else {
184+
case "onboarding":
185+
tasktrigger = taskmaster.TaskTrigger{
186+
Enabled: st.Enabled,
187+
}
188+
default:
184189
tasktrigger = taskmaster.TaskTrigger{
185190
Enabled: st.Enabled,
186191
StartBoundary: time.Date(st.StartYear, st.StartMonth, st.StartDay, st.StartHour, st.StartMinute, 0, 0, now.Location()),
@@ -205,6 +210,11 @@ func (a *Agent) CreateSchedTask(st SchedTask) (bool, error) {
205210
TaskTrigger: tasktrigger,
206211
RandomDelay: st.RandomDelay,
207212
}
213+
case "onboarding":
214+
trigger = taskmaster.RegistrationTrigger{
215+
TaskTrigger: tasktrigger,
216+
Delay: st.RandomDelay,
217+
}
208218

209219
case "daily":
210220
trigger = taskmaster.DailyTrigger{

build/rmm.exe.manifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<assemblyIdentity
44
type="win32"
55
name="TacticalRMM"
6-
version="2.5.0.0"
6+
version="2.6.0.0"
77
processorArchitecture="*"/>
88
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
99
<security>

build/setup.iss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#define MyAppName "Tactical RMM Agent"
2-
#define MyAppVersion "2.5.0"
2+
#define MyAppVersion "2.6.0"
33
#define MyAppPublisher "AmidaWare Inc"
44
#define MyAppURL "https://github.com/amidaware"
55
#define MyAppExeName "tacticalrmm.exe"

go.mod

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,20 @@ go 1.20
55
require (
66
github.com/StackExchange/wmi v1.2.1
77
github.com/elastic/go-sysinfo v1.11.1
8-
github.com/go-ole/go-ole v1.2.6
8+
github.com/go-ole/go-ole v1.3.0
99
github.com/go-ping/ping v1.1.0
10-
github.com/go-resty/resty/v2 v2.7.0
11-
github.com/gonutz/w32/v2 v2.4.0
10+
github.com/go-resty/resty/v2 v2.10.0
11+
github.com/gonutz/w32/v2 v2.11.1
1212
github.com/iamacarpet/go-win64api v0.0.0-20230324134531-ef6dbdd6db97
13-
github.com/nats-io/nats-server/v2 v2.9.20 // indirect
14-
github.com/nats-io/nats.go v1.28.0
13+
github.com/nats-io/nats.go v1.31.0
1514
github.com/rickb777/date v1.19.1
16-
github.com/shirou/gopsutil/v3 v3.23.6
15+
github.com/shirou/gopsutil/v3 v3.23.10
1716
github.com/sirupsen/logrus v1.9.3
1817
github.com/ugorji/go/codec v1.2.11
1918
github.com/wh1te909/go-win64api v0.0.0-20230802051600-21b24f62e846
2019
github.com/wh1te909/trmm-shared v0.0.0-20220227075846-f9f757361139
21-
golang.org/x/net v0.10.0 // indirect
22-
golang.org/x/sys v0.9.0
20+
golang.org/x/net v0.17.0 // indirect
21+
golang.org/x/sys v0.14.0
2322
)
2423

2524
require (
@@ -31,7 +30,7 @@ require (
3130
github.com/fourcorelabs/wintoken v1.0.0
3231
github.com/jaypipes/ghw v0.12.0
3332
github.com/kardianos/service v1.2.2
34-
github.com/spf13/viper v1.16.0
33+
github.com/spf13/viper v1.17.0
3534
)
3635

3736
require (
@@ -44,32 +43,37 @@ require (
4443
github.com/hashicorp/hcl v1.0.0 // indirect
4544
github.com/jaypipes/pcidb v1.0.0 // indirect
4645
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
47-
github.com/klauspost/compress v1.16.5 // indirect
46+
github.com/klauspost/compress v1.17.2 // indirect
4847
github.com/lufia/plan9stats v0.0.0-20220517141722-cf486979b281 // indirect
4948
github.com/magiconair/properties v1.8.7 // indirect
5049
github.com/mitchellh/go-homedir v1.1.0 // indirect
5150
github.com/mitchellh/mapstructure v1.5.0 // indirect
52-
github.com/nats-io/nkeys v0.4.4 // indirect
51+
github.com/nats-io/nkeys v0.4.6 // indirect
5352
github.com/nats-io/nuid v1.0.1 // indirect
5453
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
55-
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
54+
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
5655
github.com/pkg/errors v0.9.1 // indirect
5756
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
5857
github.com/prometheus/procfs v0.8.0 // indirect
5958
github.com/rickb777/plural v1.4.1 // indirect
59+
github.com/sagikazarmark/locafero v0.3.0 // indirect
60+
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
6061
github.com/scjalliance/comshim v0.0.0-20190308082608-cf06d2532c4e // indirect
6162
github.com/shoenig/go-m1cpu v0.1.6 // indirect
62-
github.com/spf13/afero v1.9.5 // indirect
63+
github.com/sourcegraph/conc v0.3.0 // indirect
64+
github.com/spf13/afero v1.10.0 // indirect
6365
github.com/spf13/cast v1.5.1 // indirect
64-
github.com/spf13/jwalterweatherman v1.1.0 // indirect
6566
github.com/spf13/pflag v1.0.5 // indirect
66-
github.com/subosito/gotenv v1.4.2 // indirect
67-
github.com/tklauser/go-sysconf v0.3.11 // indirect
68-
github.com/tklauser/numcpus v0.6.0 // indirect
67+
github.com/subosito/gotenv v1.6.0 // indirect
68+
github.com/tklauser/go-sysconf v0.3.12 // indirect
69+
github.com/tklauser/numcpus v0.6.1 // indirect
6970
github.com/yusufpapurcu/wmi v1.2.3 // indirect
70-
golang.org/x/crypto v0.9.0 // indirect
71-
golang.org/x/sync v0.1.0 // indirect
72-
golang.org/x/text v0.9.0 // indirect
71+
go.uber.org/atomic v1.9.0 // indirect
72+
go.uber.org/multierr v1.9.0 // indirect
73+
golang.org/x/crypto v0.15.0 // indirect
74+
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
75+
golang.org/x/sync v0.3.0 // indirect
76+
golang.org/x/text v0.14.0 // indirect
7377
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
7478
gopkg.in/ini.v1 v1.67.0 // indirect
7579
gopkg.in/toast.v1 v1.0.0-20180812000517-0a84660828b2 // indirect

0 commit comments

Comments
 (0)