Compare commits
3 Commits
sysupgrade
...
v2023.3.27
Author | SHA1 | Date | |
---|---|---|---|
24b7519579 | |||
a9e5263a19 | |||
56063a66ac |
2
Makefile
2
Makefile
@ -124,6 +124,8 @@ gitea-release: tools/gitea-release/bin/gitea-release.sh goreleaser
|
|||||||
rm -rf .gitea-release/*
|
rm -rf .gitea-release/*
|
||||||
|
|
||||||
cp dist/*.tar.gz .gitea-release/
|
cp dist/*.tar.gz .gitea-release/
|
||||||
|
cp dist/*.apk .gitea-release/
|
||||||
|
cp dist/*.deb .gitea-release/
|
||||||
|
|
||||||
GITEA_RELEASE_PROJECT="emissary" \
|
GITEA_RELEASE_PROJECT="emissary" \
|
||||||
GITEA_RELEASE_ORG="arcad" \
|
GITEA_RELEASE_ORG="arcad" \
|
||||||
|
@ -6,6 +6,7 @@ import (
|
|||||||
"forge.cadoles.com/Cadoles/emissary/internal/client"
|
"forge.cadoles.com/Cadoles/emissary/internal/client"
|
||||||
"forge.cadoles.com/Cadoles/emissary/internal/command/api/apierr"
|
"forge.cadoles.com/Cadoles/emissary/internal/command/api/apierr"
|
||||||
clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/api/flag"
|
clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/api/flag"
|
||||||
|
"forge.cadoles.com/Cadoles/emissary/internal/datastore"
|
||||||
"forge.cadoles.com/Cadoles/emissary/internal/format"
|
"forge.cadoles.com/Cadoles/emissary/internal/format"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli/v2"
|
||||||
@ -15,7 +16,21 @@ func QueryCommand() *cli.Command {
|
|||||||
return &cli.Command{
|
return &cli.Command{
|
||||||
Name: "query",
|
Name: "query",
|
||||||
Usage: "Query agents",
|
Usage: "Query agents",
|
||||||
Flags: clientFlag.ComposeFlags(),
|
Flags: clientFlag.ComposeFlags(
|
||||||
|
&cli.StringSliceFlag{
|
||||||
|
Name: "thumbprints",
|
||||||
|
Usage: "use `THUMBPRINTS` as query filter",
|
||||||
|
Value: nil,
|
||||||
|
},
|
||||||
|
&cli.Int64SliceFlag{
|
||||||
|
Name: "statuses",
|
||||||
|
Usage: "use `STATUSES` as query filter",
|
||||||
|
},
|
||||||
|
&cli.Int64SliceFlag{
|
||||||
|
Name: "ids",
|
||||||
|
Usage: "use `IDS` as query filter",
|
||||||
|
},
|
||||||
|
),
|
||||||
Action: func(ctx *cli.Context) error {
|
Action: func(ctx *cli.Context) error {
|
||||||
baseFlags := clientFlag.GetBaseFlags(ctx)
|
baseFlags := clientFlag.GetBaseFlags(ctx)
|
||||||
|
|
||||||
@ -24,9 +39,40 @@ func QueryCommand() *cli.Command {
|
|||||||
return errors.WithStack(apierr.Wrap(err))
|
return errors.WithStack(apierr.Wrap(err))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
options := make([]client.QueryAgentsOptionFunc, 0)
|
||||||
|
|
||||||
|
thumbprints := ctx.StringSlice("thumbprints")
|
||||||
|
if thumbprints != nil {
|
||||||
|
options = append(options, client.WithQueryAgentsThumbprints(thumbprints...))
|
||||||
|
}
|
||||||
|
|
||||||
|
rawIDs := ctx.Int64Slice("ids")
|
||||||
|
if rawIDs != nil {
|
||||||
|
agentIDs := func(ids []int64) []datastore.AgentID {
|
||||||
|
agentIDs := make([]datastore.AgentID, len(ids))
|
||||||
|
for i, id := range ids {
|
||||||
|
agentIDs[i] = datastore.AgentID(id)
|
||||||
|
}
|
||||||
|
return agentIDs
|
||||||
|
}(rawIDs)
|
||||||
|
options = append(options, client.WithQueryAgentsID(agentIDs...))
|
||||||
|
}
|
||||||
|
|
||||||
|
rawStatuses := ctx.Int64Slice("statuses")
|
||||||
|
if rawStatuses != nil {
|
||||||
|
statuses := func(rawStatuses []int64) []datastore.AgentStatus {
|
||||||
|
statuses := make([]datastore.AgentStatus, len(rawStatuses))
|
||||||
|
for i, status := range rawStatuses {
|
||||||
|
statuses[i] = datastore.AgentStatus(status)
|
||||||
|
}
|
||||||
|
return statuses
|
||||||
|
}(rawStatuses)
|
||||||
|
options = append(options, client.WithQueryAgentsStatus(statuses...))
|
||||||
|
}
|
||||||
|
|
||||||
client := client.New(baseFlags.ServerURL, client.WithToken(token))
|
client := client.New(baseFlags.ServerURL, client.WithToken(token))
|
||||||
|
|
||||||
agents, _, err := client.QueryAgents(ctx.Context)
|
agents, _, err := client.QueryAgents(ctx.Context, options...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return errors.WithStack(apierr.Wrap(err))
|
return errors.WithStack(apierr.Wrap(err))
|
||||||
}
|
}
|
||||||
|
@ -21,6 +21,18 @@ agent:
|
|||||||
enabled: true
|
enabled: true
|
||||||
dataDir: /var/lib/emissary/apps/data
|
dataDir: /var/lib/emissary/apps/data
|
||||||
downloadDir: /var/lib/emissary/apps/bundles
|
downloadDir: /var/lib/emissary/apps/bundles
|
||||||
|
sysupgrade:
|
||||||
|
enabled: true
|
||||||
|
sysupgradeCommand:
|
||||||
|
- sysupgrade
|
||||||
|
- --force
|
||||||
|
- -u
|
||||||
|
- -v
|
||||||
|
- '%FIRMWARE%'
|
||||||
|
firmwareVersionCommand:
|
||||||
|
- sh
|
||||||
|
- -c
|
||||||
|
- source /etc/openwrt_release && echo "$DISTRIB_ID-$DISTRIB_RELEASE-$DISTRIB_REVISION"
|
||||||
collectors:
|
collectors:
|
||||||
- name: uname
|
- name: uname
|
||||||
command: uname
|
command: uname
|
||||||
|
Reference in New Issue
Block a user