From 142a9520d0da97106c84578c142237bd41dc01fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jul 2023 21:29:11 +0000 Subject: [PATCH 01/83] fix: bump golang.org/x/sync from 0.2.0 to 0.3.0 Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.2.0 to 0.3.0. - [Commits](https://github.com/golang/sync/compare/v0.2.0...v0.3.0) --- updated-dependencies: - dependency-name: golang.org/x/sync dependency-type: indirect update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7ec994846..1c63b8188 100644 --- a/go.mod +++ b/go.mod @@ -145,7 +145,7 @@ require ( golang.org/x/mod v0.9.0 // indirect golang.org/x/net v0.10.0 // indirect golang.org/x/oauth2 v0.8.0 // indirect - golang.org/x/sync v0.2.0 // indirect + golang.org/x/sync v0.3.0 // indirect golang.org/x/sys v0.8.0 // indirect golang.org/x/term v0.8.0 // indirect golang.org/x/text v0.9.0 // indirect diff --git a/go.sum b/go.sum index 131b061c3..9c01a7e8f 100644 --- a/go.sum +++ b/go.sum @@ -946,8 +946,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= -golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= From b84eb48b26d43e58c4e13933979c48d7d2a48788 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 22:07:24 +0000 Subject: [PATCH 02/83] fix: bump github.com/nats-io/nats-server/v2 from 2.7.4 to 2.9.20 Bumps [github.com/nats-io/nats-server/v2](https://github.com/nats-io/nats-server) from 2.7.4 to 2.9.20. - [Release notes](https://github.com/nats-io/nats-server/releases) - [Changelog](https://github.com/nats-io/nats-server/blob/main/.goreleaser.yml) - [Commits](https://github.com/nats-io/nats-server/compare/v2.7.4...v2.9.20) --- updated-dependencies: - dependency-name: github.com/nats-io/nats-server/v2 dependency-type: indirect update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 13 ++++++------- go.sum | 24 +++++++++++------------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/go.mod b/go.mod index 44791ff7a..1259d33e9 100644 --- a/go.mod +++ b/go.mod @@ -26,6 +26,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.75.0 github.com/opentracing/opentracing-go v1.2.0 github.com/ory/dockertest/v3 v3.10.0 + github.com/patrickmn/go-cache v2.1.0+incompatible github.com/pkg/profile v1.7.0 github.com/prometheus/client_golang v1.16.0 github.com/prometheus/prometheus v0.43.0 @@ -98,7 +99,7 @@ require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.16.3 // indirect + github.com/klauspost/compress v1.16.5 // indirect github.com/knadh/koanf v1.5.0 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mainflux/senml v1.5.0 // indirect @@ -109,10 +110,9 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mostynb/go-grpc-compression v1.1.17 // indirect - github.com/nats-io/jwt/v2 v2.3.0 // indirect - github.com/nats-io/nats-server/v2 v2.7.4 // indirect - github.com/nats-io/nats.go v1.13.1-0.20220308171302-2f2f6968e98d // indirect - github.com/nats-io/nkeys v0.3.0 // indirect + github.com/nats-io/nats-server/v2 v2.9.20 // indirect + github.com/nats-io/nats.go v1.27.0 // indirect + github.com/nats-io/nkeys v0.4.4 // indirect github.com/nats-io/nuid v1.0.1 // indirect github.com/oklog/ulid/v2 v2.0.2 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.75.0 // indirect @@ -120,7 +120,6 @@ require ( github.com/opencontainers/image-spec v1.0.2 // indirect github.com/opencontainers/runc v1.1.5 // indirect github.com/ory/keto/proto/ory/keto/acl/v1alpha1 v0.0.0-20210616104402-80e043246cf9 // indirect - github.com/patrickmn/go-cache v2.1.0+incompatible // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.4.0 // indirect @@ -142,7 +141,7 @@ require ( go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0 // indirect go.opentelemetry.io/otel v1.14.0 // indirect go.uber.org/atomic v1.10.0 // indirect - golang.org/x/crypto v0.7.0 // indirect + golang.org/x/crypto v0.9.0 // indirect golang.org/x/mod v0.9.0 // indirect golang.org/x/net v0.10.0 // indirect golang.org/x/oauth2 v0.8.0 // indirect diff --git a/go.sum b/go.sum index 09c6ef051..e36b3cb14 100644 --- a/go.sum +++ b/go.sum @@ -454,8 +454,8 @@ github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1q github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= -github.com/klauspost/compress v1.16.3 h1:XuJt9zzcnaz6a16/OU53ZjWp/v7/42WcR5t2a0PcNQY= -github.com/klauspost/compress v1.16.3/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI= +github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/knadh/koanf v1.5.0 h1:q2TSd/3Pyc/5yP9ldIrSdIz26MCcyNQzW0pEAugLPNs= github.com/knadh/koanf v1.5.0/go.mod h1:Hgyjp4y8v44hpZtPzs7JZfRAW5AhN7KfZcwv1RYggDs= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -550,14 +550,13 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/nats-io/jwt/v2 v2.3.0 h1:z2mA1a7tIf5ShggOFlR1oBPgd6hGqcDYsISxZByUzdI= -github.com/nats-io/jwt/v2 v2.3.0/go.mod h1:0tqz9Hlu6bCBFLWAASKhE5vUA4c24L9KPUUgvwumE/k= -github.com/nats-io/nats-server/v2 v2.7.4 h1:c+BZJ3rGzUKCBIM4IXO8uNT2u1vajGbD1kPA6wqCEaM= -github.com/nats-io/nats-server/v2 v2.7.4/go.mod h1:1vZ2Nijh8tcyNe8BDVyTviCd9NYzRbubQYiEHsvOQWc= -github.com/nats-io/nats.go v1.13.1-0.20220308171302-2f2f6968e98d h1:zJf4l8Kp67RIZhoVeniSLZs69SHNgjLHz0aNsqPPlx8= -github.com/nats-io/nats.go v1.13.1-0.20220308171302-2f2f6968e98d/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w= -github.com/nats-io/nkeys v0.3.0 h1:cgM5tL53EvYRU+2YLXIK0G2mJtK12Ft9oeooSZMA2G8= -github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4= +github.com/nats-io/jwt/v2 v2.4.1 h1:Y35W1dgbbz2SQUYDPCaclXcuqleVmpbRa7646Jf2EX4= +github.com/nats-io/nats-server/v2 v2.9.20 h1:bt1dW6xsL1hWWwv7Hovm+EJt5L6iplyqlgEFkoEUk0k= +github.com/nats-io/nats-server/v2 v2.9.20/go.mod h1:aTb/xtLCGKhfTFLxP591CMWfkdgBmcUUSkiSOe5A3gw= +github.com/nats-io/nats.go v1.27.0 h1:3o9fsPhmoKm+yK7rekH2GtWoE+D9jFbw8N3/ayI1C00= +github.com/nats-io/nats.go v1.27.0/go.mod h1:XpbWUlOElGwTYbMR7imivs7jJj9GtK7ypv321Wp6pjc= +github.com/nats-io/nkeys v0.4.4 h1:xvBJ8d69TznjcQl9t6//Q5xXuVhyYiSos6RPtvQNTwA= +github.com/nats-io/nkeys v0.4.4/go.mod h1:XUkxdLPTufzlihbamfzQ7mw/VGx6ObUs+0bN5sNvt64= github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk= @@ -823,13 +822,12 @@ golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= -golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= +golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= +golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= From 55ff18072034feb283c48a94455e89b50bce1cba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 21:08:21 +0000 Subject: [PATCH 03/83] fix: bump webdriver-manager from 3.8.6 to 3.9.1 Bumps [webdriver-manager](https://github.com/SergeyPirogov/webdriver_manager) from 3.8.6 to 3.9.1. - [Release notes](https://github.com/SergeyPirogov/webdriver_manager/releases) - [Changelog](https://github.com/SergeyPirogov/webdriver_manager/blob/master/CHANGELOG.md) - [Commits](https://github.com/SergeyPirogov/webdriver_manager/compare/v3.8.6...v3.9.1) --- updated-dependencies: - dependency-name: webdriver-manager dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- python-test/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-test/requirements.txt b/python-test/requirements.txt index b2e1fc660..00fd7f26a 100644 --- a/python-test/requirements.txt +++ b/python-test/requirements.txt @@ -12,4 +12,4 @@ mkdocs==1.4.3 mkdocs-material==9.1.18 prometheus-client==0.17.0 psutil==5.9.5 -webdriver-manager==3.8.6 +webdriver-manager==3.9.1 From 9ba672154b8cb9028a7caac25f0ad2b18695b1a4 Mon Sep 17 00:00:00 2001 From: Luiz Pegoraro Date: Tue, 25 Jul 2023 10:50:46 -0300 Subject: [PATCH 04/83] fix(sinker): add redundancy to create configuration in notifying activity of sink. --- sinker/otel/bridgeservice/bridge.go | 25 ++++++++++++++++++++++++- sinker/otel/orbreceiver/metrics.go | 1 - sinker/service.go | 3 ++- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/sinker/otel/bridgeservice/bridge.go b/sinker/otel/bridgeservice/bridge.go index 45753d7a3..db8053531 100644 --- a/sinker/otel/bridgeservice/bridge.go +++ b/sinker/otel/bridgeservice/bridge.go @@ -2,7 +2,10 @@ package bridgeservice import ( "context" + "encoding/json" "fmt" + "github.com/orb-community/orb/pkg/types" + sinkspb "github.com/orb-community/orb/sinks/pb" "sort" "time" @@ -27,6 +30,7 @@ func NewBridgeService(logger *zap.Logger, defaultCacheExpiration time.Duration, sinkerCache config.ConfigRepo, policiesClient policiespb.PolicyServiceClient, + sinksClient sinkspb.SinkServiceClient, fleetClient fleetpb.FleetServiceClient, messageInputCounter metrics.Counter) SinkerOtelBridgeService { return SinkerOtelBridgeService{ defaultCacheExpiration: defaultCacheExpiration, @@ -35,6 +39,7 @@ func NewBridgeService(logger *zap.Logger, sinkerCache: sinkerCache, policiesClient: policiesClient, fleetClient: fleetClient, + sinksClient: sinksClient, messageInputCounter: messageInputCounter, } } @@ -46,6 +51,7 @@ type SinkerOtelBridgeService struct { sinkerCache config.ConfigRepo policiesClient policiespb.PolicyServiceClient fleetClient fleetpb.FleetServiceClient + sinksClient sinkspb.SinkServiceClient messageInputCounter metrics.Counter } @@ -65,7 +71,24 @@ func (bs *SinkerOtelBridgeService) NotifyActiveSink(ctx context.Context, mfOwner cfgRepo, err := bs.sinkerCache.Get(mfOwnerId, sinkId) if err != nil { bs.logger.Error("unable to retrieve the sink config", zap.Error(err)) - return err + sinkData, _ := bs.sinksClient.RetrieveSink(ctx, &sinkspb.SinkByIDReq{ + SinkID: sinkId, + OwnerID: mfOwnerId, + }) + var metadata types.Metadata + _ = json.Unmarshal(sinkData.Config, &metadata) + cfgRepo = config.SinkConfig{ + SinkID: sinkId, + OwnerID: mfOwnerId, + Config: metadata, + State: config.Active, + Msg: "", + } + err = bs.sinkerCache.DeployCollector(ctx, cfgRepo) + if err != nil { + bs.logger.Error("error during update sink cache", zap.String("sinkId", sinkId), zap.Error(err)) + return err + } } // only updates sink state if status Idle or Unknown diff --git a/sinker/otel/orbreceiver/metrics.go b/sinker/otel/orbreceiver/metrics.go index 90a851153..823c61741 100644 --- a/sinker/otel/orbreceiver/metrics.go +++ b/sinker/otel/orbreceiver/metrics.go @@ -114,7 +114,6 @@ func (r *OrbReceiver) ProccessMetricsContext(scope pmetric.ScopeMetrics, channel err := r.cfg.SinkerService.NotifyActiveSink(r.ctx, agentPb.OwnerID, sinkId, "active", "") if err != nil { r.cfg.Logger.Error("error notifying metrics sink active, changing state, skipping sink", zap.String("sink-id", sinkId), zap.Error(err)) - continue } attributeCtx = context.WithValue(attributeCtx, "sink_id", sinkId) mr := pmetric.NewMetrics() diff --git a/sinker/service.go b/sinker/service.go index 89260be98..db30bd2b8 100644 --- a/sinker/service.go +++ b/sinker/service.go @@ -100,7 +100,8 @@ func (svc SinkerService) startOtel(ctx context.Context) error { if svc.otel { var err error - bridgeService := bridgeservice.NewBridgeService(svc.logger, svc.inMemoryCacheExpiration, svc.sinkerCache, svc.policiesClient, svc.fleetClient, svc.messageInputCounter) + bridgeService := bridgeservice.NewBridgeService(svc.logger, svc.inMemoryCacheExpiration, svc.sinkerCache, + svc.policiesClient, svc.sinksClient, svc.fleetClient, svc.messageInputCounter) svc.otelMetricsCancelFunct, err = otel.StartOtelMetricsComponents(ctx, &bridgeService, svc.logger, svc.otelKafkaUrl, svc.pubSub) // starting Otel Logs components From fd2f633eca20dfb1daa5a39105a58340def6c33a Mon Sep 17 00:00:00 2001 From: Luiz Pegoraro Date: Tue, 25 Jul 2023 10:50:55 -0300 Subject: [PATCH 05/83] build: version upgrade --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 4e8f395fa..1b58cc101 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.26.0 +0.27.0 From 1d2828396993b7234912ac285e034495611e9233 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 21:08:21 +0000 Subject: [PATCH 06/83] fix: bump webdriver-manager from 3.8.6 to 3.9.1 Bumps [webdriver-manager](https://github.com/SergeyPirogov/webdriver_manager) from 3.8.6 to 3.9.1. - [Release notes](https://github.com/SergeyPirogov/webdriver_manager/releases) - [Changelog](https://github.com/SergeyPirogov/webdriver_manager/blob/master/CHANGELOG.md) - [Commits](https://github.com/SergeyPirogov/webdriver_manager/compare/v3.8.6...v3.9.1) --- updated-dependencies: - dependency-name: webdriver-manager dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- python-test/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-test/requirements.txt b/python-test/requirements.txt index cd8a90e24..857375998 100644 --- a/python-test/requirements.txt +++ b/python-test/requirements.txt @@ -12,4 +12,4 @@ mkdocs==1.4.3 mkdocs-material==9.1.18 prometheus-client==0.17.0 psutil==5.9.5 -webdriver-manager==3.8.6 +webdriver-manager==3.9.1 From b49a49bd4cd0979274cf56c4a00c1d407fbf5d27 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Jul 2023 17:34:11 +0000 Subject: [PATCH 07/83] fix: bump mkdocs-material from 9.1.18 to 9.1.19 Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.1.18 to 9.1.19. - [Release notes](https://github.com/squidfunk/mkdocs-material/releases) - [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG) - [Commits](https://github.com/squidfunk/mkdocs-material/compare/9.1.18...9.1.19) --- updated-dependencies: - dependency-name: mkdocs-material dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- python-test/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-test/requirements.txt b/python-test/requirements.txt index 857375998..57cffa898 100644 --- a/python-test/requirements.txt +++ b/python-test/requirements.txt @@ -9,7 +9,7 @@ behavex==2.0.1 deepdiff==6.3.0 jsonschema==4.18.4 mkdocs==1.4.3 -mkdocs-material==9.1.18 +mkdocs-material==9.1.19 prometheus-client==0.17.0 psutil==5.9.5 webdriver-manager==3.9.1 From b339a0277ad9dbaff9e29a8a2ce9ecb302c542d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 21:08:12 +0000 Subject: [PATCH 08/83] fix: bump pyyaml from 6.0 to 6.0.1 Bumps [pyyaml](https://github.com/yaml/pyyaml) from 6.0 to 6.0.1. - [Changelog](https://github.com/yaml/pyyaml/blob/6.0.1/CHANGES) - [Commits](https://github.com/yaml/pyyaml/compare/6.0...6.0.1) --- updated-dependencies: - dependency-name: pyyaml dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- python-test/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-test/requirements.txt b/python-test/requirements.txt index 57cffa898..d43a30900 100644 --- a/python-test/requirements.txt +++ b/python-test/requirements.txt @@ -2,7 +2,7 @@ behave==1.2.6 ciso8601==2.3.0 docker==6.1.3 PyHamcrest==2.0.4 -PyYAML==6.0 +PyYAML==6.0.1 retry==0.9.2 selenium==4.10.0 behavex==2.0.1 From 51c93a38c7b8da54c59f74394f0d2fd361a56ec8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 22:07:24 +0000 Subject: [PATCH 09/83] fix: bump github.com/nats-io/nats-server/v2 from 2.7.4 to 2.9.20 Bumps [github.com/nats-io/nats-server/v2](https://github.com/nats-io/nats-server) from 2.7.4 to 2.9.20. - [Release notes](https://github.com/nats-io/nats-server/releases) - [Changelog](https://github.com/nats-io/nats-server/blob/main/.goreleaser.yml) - [Commits](https://github.com/nats-io/nats-server/compare/v2.7.4...v2.9.20) --- updated-dependencies: - dependency-name: github.com/nats-io/nats-server/v2 dependency-type: indirect update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 13 ++++++------- go.sum | 24 +++++++++++------------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/go.mod b/go.mod index 44791ff7a..1259d33e9 100644 --- a/go.mod +++ b/go.mod @@ -26,6 +26,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.75.0 github.com/opentracing/opentracing-go v1.2.0 github.com/ory/dockertest/v3 v3.10.0 + github.com/patrickmn/go-cache v2.1.0+incompatible github.com/pkg/profile v1.7.0 github.com/prometheus/client_golang v1.16.0 github.com/prometheus/prometheus v0.43.0 @@ -98,7 +99,7 @@ require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.16.3 // indirect + github.com/klauspost/compress v1.16.5 // indirect github.com/knadh/koanf v1.5.0 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mainflux/senml v1.5.0 // indirect @@ -109,10 +110,9 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mostynb/go-grpc-compression v1.1.17 // indirect - github.com/nats-io/jwt/v2 v2.3.0 // indirect - github.com/nats-io/nats-server/v2 v2.7.4 // indirect - github.com/nats-io/nats.go v1.13.1-0.20220308171302-2f2f6968e98d // indirect - github.com/nats-io/nkeys v0.3.0 // indirect + github.com/nats-io/nats-server/v2 v2.9.20 // indirect + github.com/nats-io/nats.go v1.27.0 // indirect + github.com/nats-io/nkeys v0.4.4 // indirect github.com/nats-io/nuid v1.0.1 // indirect github.com/oklog/ulid/v2 v2.0.2 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.75.0 // indirect @@ -120,7 +120,6 @@ require ( github.com/opencontainers/image-spec v1.0.2 // indirect github.com/opencontainers/runc v1.1.5 // indirect github.com/ory/keto/proto/ory/keto/acl/v1alpha1 v0.0.0-20210616104402-80e043246cf9 // indirect - github.com/patrickmn/go-cache v2.1.0+incompatible // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.4.0 // indirect @@ -142,7 +141,7 @@ require ( go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0 // indirect go.opentelemetry.io/otel v1.14.0 // indirect go.uber.org/atomic v1.10.0 // indirect - golang.org/x/crypto v0.7.0 // indirect + golang.org/x/crypto v0.9.0 // indirect golang.org/x/mod v0.9.0 // indirect golang.org/x/net v0.10.0 // indirect golang.org/x/oauth2 v0.8.0 // indirect diff --git a/go.sum b/go.sum index 09c6ef051..e36b3cb14 100644 --- a/go.sum +++ b/go.sum @@ -454,8 +454,8 @@ github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1q github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= -github.com/klauspost/compress v1.16.3 h1:XuJt9zzcnaz6a16/OU53ZjWp/v7/42WcR5t2a0PcNQY= -github.com/klauspost/compress v1.16.3/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI= +github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/knadh/koanf v1.5.0 h1:q2TSd/3Pyc/5yP9ldIrSdIz26MCcyNQzW0pEAugLPNs= github.com/knadh/koanf v1.5.0/go.mod h1:Hgyjp4y8v44hpZtPzs7JZfRAW5AhN7KfZcwv1RYggDs= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -550,14 +550,13 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/nats-io/jwt/v2 v2.3.0 h1:z2mA1a7tIf5ShggOFlR1oBPgd6hGqcDYsISxZByUzdI= -github.com/nats-io/jwt/v2 v2.3.0/go.mod h1:0tqz9Hlu6bCBFLWAASKhE5vUA4c24L9KPUUgvwumE/k= -github.com/nats-io/nats-server/v2 v2.7.4 h1:c+BZJ3rGzUKCBIM4IXO8uNT2u1vajGbD1kPA6wqCEaM= -github.com/nats-io/nats-server/v2 v2.7.4/go.mod h1:1vZ2Nijh8tcyNe8BDVyTviCd9NYzRbubQYiEHsvOQWc= -github.com/nats-io/nats.go v1.13.1-0.20220308171302-2f2f6968e98d h1:zJf4l8Kp67RIZhoVeniSLZs69SHNgjLHz0aNsqPPlx8= -github.com/nats-io/nats.go v1.13.1-0.20220308171302-2f2f6968e98d/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w= -github.com/nats-io/nkeys v0.3.0 h1:cgM5tL53EvYRU+2YLXIK0G2mJtK12Ft9oeooSZMA2G8= -github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4= +github.com/nats-io/jwt/v2 v2.4.1 h1:Y35W1dgbbz2SQUYDPCaclXcuqleVmpbRa7646Jf2EX4= +github.com/nats-io/nats-server/v2 v2.9.20 h1:bt1dW6xsL1hWWwv7Hovm+EJt5L6iplyqlgEFkoEUk0k= +github.com/nats-io/nats-server/v2 v2.9.20/go.mod h1:aTb/xtLCGKhfTFLxP591CMWfkdgBmcUUSkiSOe5A3gw= +github.com/nats-io/nats.go v1.27.0 h1:3o9fsPhmoKm+yK7rekH2GtWoE+D9jFbw8N3/ayI1C00= +github.com/nats-io/nats.go v1.27.0/go.mod h1:XpbWUlOElGwTYbMR7imivs7jJj9GtK7ypv321Wp6pjc= +github.com/nats-io/nkeys v0.4.4 h1:xvBJ8d69TznjcQl9t6//Q5xXuVhyYiSos6RPtvQNTwA= +github.com/nats-io/nkeys v0.4.4/go.mod h1:XUkxdLPTufzlihbamfzQ7mw/VGx6ObUs+0bN5sNvt64= github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk= @@ -823,13 +822,12 @@ golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= -golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= +golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= +golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= From eb7f93aa624f3d6f223171626f98335d83ecd25d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:58:33 +0000 Subject: [PATCH 10/83] fix: bump go.opentelemetry.io/collector/confmap from 0.75.0 to 0.81.0 Bumps [go.opentelemetry.io/collector/confmap](https://github.com/open-telemetry/opentelemetry-collector) from 0.75.0 to 0.81.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.75.0...v0.81.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/collector/confmap dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 7 ++++--- go.sum | 17 ++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 1259d33e9..8f29cfee3 100644 --- a/go.mod +++ b/go.mod @@ -33,10 +33,10 @@ require ( github.com/rubenv/sql-migrate v1.1.1 github.com/spf13/cobra v1.7.0 github.com/spf13/viper v1.15.0 - github.com/stretchr/testify v1.8.2 + github.com/stretchr/testify v1.8.4 github.com/uber/jaeger-client-go v2.30.0+incompatible go.opentelemetry.io/collector/component v0.75.0 - go.opentelemetry.io/collector/confmap v0.75.0 + go.opentelemetry.io/collector/confmap v0.81.0 go.opentelemetry.io/collector/consumer v0.75.0 go.opentelemetry.io/collector/exporter v0.75.0 go.opentelemetry.io/collector/receiver v0.75.0 @@ -101,6 +101,7 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.5 // indirect github.com/knadh/koanf v1.5.0 // indirect + github.com/knadh/koanf/v2 v2.0.1 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mainflux/senml v1.5.0 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect @@ -137,7 +138,7 @@ require ( github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.75.0 // indirect + go.opentelemetry.io/collector/featuregate v1.0.0-rcv0013 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0 // indirect go.opentelemetry.io/otel v1.14.0 // indirect go.uber.org/atomic v1.10.0 // indirect diff --git a/go.sum b/go.sum index e36b3cb14..aa45cfea8 100644 --- a/go.sum +++ b/go.sum @@ -399,7 +399,6 @@ github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvh github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= -github.com/hjson/hjson-go/v4 v4.0.0 h1:wlm6IYYqHjOdXH1gHev4VoXCaW20HdQAGCxdOEEg2cs= github.com/hjson/hjson-go/v4 v4.0.0/go.mod h1:KaYt3bTw3zhBjYqnXkYywcYctk0A2nxeEFTse3rH13E= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= @@ -434,7 +433,6 @@ github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGw github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jmoiron/sqlx v1.3.4 h1:wv+0IJZfL5z0uZoUjlpKgHkgaFSYD+r9CfrXjEXsO7w= github.com/jmoiron/sqlx v1.3.4/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ= -github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= @@ -458,6 +456,8 @@ github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/d github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/knadh/koanf v1.5.0 h1:q2TSd/3Pyc/5yP9ldIrSdIz26MCcyNQzW0pEAugLPNs= github.com/knadh/koanf v1.5.0/go.mod h1:Hgyjp4y8v44hpZtPzs7JZfRAW5AhN7KfZcwv1RYggDs= +github.com/knadh/koanf/v2 v2.0.1 h1:1dYGITt1I23x8cfx8ZnldtezdyaZtfAuRtIFOiRzK7g= +github.com/knadh/koanf/v2 v2.0.1/go.mod h1:ZeiIlIDXTE7w1lMT6UVcNiRAS2/rCeLn/GdLNvY1Dus= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kortschak/utter v1.0.1/go.mod h1:vSmSjbyrlKjjsL71193LmzBOKgwePk9DH6uFaWHIInc= @@ -607,7 +607,6 @@ github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTK github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= @@ -716,8 +715,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= @@ -771,14 +770,14 @@ go.opentelemetry.io/collector v0.75.0 h1:j6gAYcrKydPyBUnHeUDbzCfMzytwkIN1WwPOXBm go.opentelemetry.io/collector v0.75.0/go.mod h1:5I49yghQpThAFWHtD78AURnWB/3MXVepVhAYfBMdDrc= go.opentelemetry.io/collector/component v0.75.0 h1:+Sp5HPYhDMjmiBjFiOAuthbvqlKf8cE+ho8/WYEMAWQ= go.opentelemetry.io/collector/component v0.75.0/go.mod h1:7PvmC6Vc1NDq63gYJvx6QeLW1ydRnjj7f1jLDITSbeI= -go.opentelemetry.io/collector/confmap v0.75.0 h1:yvtrXWKbYVXm8LRHi2aQyrSkN+ildMQq2IADpYg9F68= -go.opentelemetry.io/collector/confmap v0.75.0/go.mod h1:T1I41gDZxvpIqUmyNziFMGBwixEsX6qNiwMY5apG5Gk= +go.opentelemetry.io/collector/confmap v0.81.0 h1:AqweoBGdF3jGM2/KgP5GS6bmN+1aVrEiCy4nPf7IBE4= +go.opentelemetry.io/collector/confmap v0.81.0/go.mod h1:iCTnTqGgZZJumhJxpY7rrJz9UQ/0zjPmsJz2Z7Tp4RY= go.opentelemetry.io/collector/consumer v0.75.0 h1:f+j560Enwrh1JHY+/dfVwidn9G/f+w0ZOx70tc0UTtg= go.opentelemetry.io/collector/consumer v0.75.0/go.mod h1:ilbTs6xKJO+eknSor/9Q0CMed7mDSByOIbSh5khVFWY= go.opentelemetry.io/collector/exporter v0.75.0 h1:ZOeUHUoRAstIS7xPh+vZ1a/6YO3cITJI0Ed1+XG8foA= go.opentelemetry.io/collector/exporter v0.75.0/go.mod h1:wYSNU8OwTmnrgTK5bk84H++Ieqv4d+GVMR92wBsolJQ= -go.opentelemetry.io/collector/featuregate v0.75.0 h1:543kdhXh7/dHTwpHsjv+lgIz73RJD2lCkLrFi4UjZjk= -go.opentelemetry.io/collector/featuregate v0.75.0/go.mod h1:pmVMr98Ps6QKyEHiVPN7o3Qd8K//M2NapfOv5BMWvA0= +go.opentelemetry.io/collector/featuregate v1.0.0-rcv0013 h1:tiTUG9X/gEDN1oDYQOBVUFYQfhUG2CvgW9VhBc2uk1U= +go.opentelemetry.io/collector/featuregate v1.0.0-rcv0013/go.mod h1:0mE3mDLmUrOXVoNsuvj+7dV14h/9HFl/Fy9YTLoLObo= go.opentelemetry.io/collector/pdata v1.0.0-rc9 h1:K1GND9w4hOMVE4lLpGt+0KvjIBcbsR54ZsijEyUQFFI= go.opentelemetry.io/collector/pdata v1.0.0-rc9/go.mod h1:olBmmDzT077Jyag/kVDAaG9OFkzLF6zSm8mfufL4HW4= go.opentelemetry.io/collector/receiver v0.75.0 h1:ZgoShBSTprt7vExTLtXTmEH05qIHU3tORhBWyk0PuB4= From e3b478bfa7ee1155efda816983d860d11d12a4e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Jul 2023 17:33:56 +0000 Subject: [PATCH 11/83] fix(mod): updated versions per recommendation of dependabot. --- go.mod | 6 +++--- go.sum | 13 +++++++------ python-test/requirements.txt | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 8f29cfee3..5d5eed071 100644 --- a/go.mod +++ b/go.mod @@ -146,7 +146,7 @@ require ( golang.org/x/mod v0.9.0 // indirect golang.org/x/net v0.10.0 // indirect golang.org/x/oauth2 v0.8.0 // indirect - golang.org/x/sync v0.2.0 // indirect + golang.org/x/sync v0.3.0 // indirect golang.org/x/sys v0.8.0 // indirect golang.org/x/term v0.8.0 // indirect golang.org/x/text v0.9.0 // indirect @@ -194,8 +194,8 @@ require ( github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rs/cors v1.8.3 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect - github.com/xdg-go/scram v1.1.1 - github.com/xdg-go/stringprep v1.0.3 // indirect + github.com/xdg-go/scram v1.1.2 + github.com/xdg-go/stringprep v1.0.4 // indirect go.opentelemetry.io/collector/receiver/otlpreceiver v0.75.0 go.opentelemetry.io/collector/semconv v0.75.0 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0 // indirect diff --git a/go.sum b/go.sum index aa45cfea8..600b41528 100644 --- a/go.sum +++ b/go.sum @@ -732,10 +732,10 @@ github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= -github.com/xdg-go/scram v1.1.1 h1:VOMT+81stJgXW3CpHyqHN3AXDYIMsx56mEFrB37Mb/E= -github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g= -github.com/xdg-go/stringprep v1.0.3 h1:kdwGpVNwPFtjs98xCGkHjQtGKh86rDcRZN17QEMCOIs= -github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8= +github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY= +github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4= +github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8= +github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= @@ -945,8 +945,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= -golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1043,6 +1043,7 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= diff --git a/python-test/requirements.txt b/python-test/requirements.txt index d43a30900..a63535cdf 100644 --- a/python-test/requirements.txt +++ b/python-test/requirements.txt @@ -6,10 +6,10 @@ PyYAML==6.0.1 retry==0.9.2 selenium==4.10.0 behavex==2.0.1 -deepdiff==6.3.0 +deepdiff==6.3.1 jsonschema==4.18.4 mkdocs==1.4.3 mkdocs-material==9.1.19 -prometheus-client==0.17.0 +prometheus-client==0.17.1 psutil==5.9.5 webdriver-manager==3.9.1 From 440ed3fc6554653974e14807d50ef9494b643a47 Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Thu, 27 Jul 2023 10:39:08 -0300 Subject: [PATCH 12/83] fix(orb-ui) On add agent, policy, group. messages for invalid names (#2532) --- .../policies.agent/add/agent.policy.add.component.html | 4 ++-- ui/src/app/pages/fleet/agents/add/agent.add.component.html | 5 +++-- .../pages/fleet/groups/add/agent.group.add.component.html | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.html b/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.html index 7253eb0a2..84c3264f7 100644 --- a/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.html +++ b/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.html @@ -43,10 +43,10 @@

{{ isEdit ? 'Edit Agent Policy' : 'Create Agent Policy'}}

fieldSize="medium" formControlName="name" fullWidth="true" - [status]="detailsFG?.controls.name.touched ? (!detailsFG.controls.name.valid ? 'danger' : 'success') : 'basic'" + [status]="detailsFG?.controls.name.dirty ? (!detailsFG.controls.name.valid ? 'danger' : 'success') : 'basic'" id="name" nbInput/> - +

Name is required!

diff --git a/ui/src/app/pages/fleet/agents/add/agent.add.component.html b/ui/src/app/pages/fleet/agents/add/agent.add.component.html index 1450ac748..717514493 100644 --- a/ui/src/app/pages/fleet/agents/add/agent.add.component.html +++ b/ui/src/app/pages/fleet/agents/add/agent.add.component.html @@ -33,9 +33,10 @@

{{isEdit ? 'Edit Agent' : 'New Agent'}}

fieldSize="medium" formControlName="name" fullWidth="true" - [status]="firstFormGroup?.controls.name.touched ? (!firstFormGroup.controls.name.valid ? 'danger' : 'success') : 'basic'" + [status]="firstFormGroup.controls?.name.dirty ? (!firstFormGroup.controls.name.valid ? 'danger' : 'success') : 'basic'" nbInput/> - +

Name is required!

diff --git a/ui/src/app/pages/fleet/groups/add/agent.group.add.component.html b/ui/src/app/pages/fleet/groups/add/agent.group.add.component.html index f221d925e..7b497d0cf 100644 --- a/ui/src/app/pages/fleet/groups/add/agent.group.add.component.html +++ b/ui/src/app/pages/fleet/groups/add/agent.group.add.component.html @@ -33,11 +33,11 @@

{{strings[isEdit ? 'edit' : 'add']['header']}}

autofocus fieldSize="medium" formControlName="name" - [status]="firstFormGroup?.controls.name.touched ? (!firstFormGroup.controls.name.valid ? 'danger' : 'success') : 'basic'" + [status]="firstFormGroup?.controls.name.dirty ? (!firstFormGroup.controls.name.valid ? 'danger' : 'success') : 'basic'" fullWidth="true" nbInput/> - +

Name is required!

From b5634ff0d92038f2c7799a89e3d61f50ba11b80d Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Thu, 27 Jul 2023 10:39:20 -0300 Subject: [PATCH 13/83] fix(orb-ui): On edit policy, fix pattern message (#2533) --- .../orb/policy/policy-details/policy-details.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/app/shared/components/orb/policy/policy-details/policy-details.component.html b/ui/src/app/shared/components/orb/policy/policy-details/policy-details.component.html index 2b1966485..65b203ff9 100644 --- a/ui/src/app/shared/components/orb/policy/policy-details/policy-details.component.html +++ b/ui/src/app/shared/components/orb/policy/policy-details/policy-details.component.html @@ -74,7 +74,7 @@ Name is required.
- Name does not match the pattern. + Name must start with a letter or "_" and contain only letters, numbers, "-" or "_"
Name must not exceed 64 characters. From cb83098a6aebb6df9038588ff71a856ee39548d0 Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Thu, 27 Jul 2023 10:39:30 -0300 Subject: [PATCH 14/83] fix(orb-ui): uptade sink states colors on delete selected modal (#2537) --- .../shared/components/delete/delete.selected.component.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/src/app/shared/components/delete/delete.selected.component.scss b/ui/src/app/shared/components/delete/delete.selected.component.scss index 1ff0c3cd0..0e9675eb3 100644 --- a/ui/src/app/shared/components/delete/delete.selected.component.scss +++ b/ui/src/app/shared/components/delete/delete.selected.component.scss @@ -45,13 +45,13 @@ nb-card { } } .orb-service- { - &new { + &new, &unknown { color: #9b51e0; } &online, &healthy, &in, &active { color: #6fcf97; } - &stale, &none, &unknown, ¬ { + &stale, &none, ¬, &idle { color: #f2994a; } &error, &failure { From eb833d075c1e0ef95a48bfeb0f5d086ad16c4147 Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Thu, 27 Jul 2023 10:39:42 -0300 Subject: [PATCH 15/83] fix(orb-ui): idle sink color (#2534) --- ui/src/app/pages/sinks/list/sink.list.component.scss | 2 +- .../orb/sink/sink-details/sink-details.component.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/src/app/pages/sinks/list/sink.list.component.scss b/ui/src/app/pages/sinks/list/sink.list.component.scss index 6687613c0..1a4131acc 100644 --- a/ui/src/app/pages/sinks/list/sink.list.component.scss +++ b/ui/src/app/pages/sinks/list/sink.list.component.scss @@ -149,7 +149,7 @@ tr div p { color: #df316f; } &idle { - color: #f2dc4a; + color: #f2994a; } } diff --git a/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.scss b/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.scss index c525932ca..0b0ac1c36 100644 --- a/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.scss +++ b/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.scss @@ -24,7 +24,7 @@ input { color: #df316f; } &idle { - color: #f2dc4a; + color: #f2994a; } } .ns1red { From dabe4c256fedc0c5365f493483baea1567488e76 Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Thu, 27 Jul 2023 10:39:56 -0300 Subject: [PATCH 16/83] fix(orb-ui): Notification srvice stop working after open agent view (#2536) --- ui/src/app/pages/fleet/agents/view/agent.view.component.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ui/src/app/pages/fleet/agents/view/agent.view.component.ts b/ui/src/app/pages/fleet/agents/view/agent.view.component.ts index 4bfd43204..1bc273c29 100644 --- a/ui/src/app/pages/fleet/agents/view/agent.view.component.ts +++ b/ui/src/app/pages/fleet/agents/view/agent.view.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; +import { ActivatedRoute } from '@angular/router'; import { AgentGroup } from 'app/common/interfaces/orb/agent.group.interface'; import { Agent, AgentStates } from 'app/common/interfaces/orb/agent.interface'; import { Dataset } from 'app/common/interfaces/orb/dataset.policy.interface'; @@ -37,7 +37,6 @@ export class AgentViewComponent implements OnInit, OnDestroy { constructor( protected agentsService: AgentsService, protected route: ActivatedRoute, - protected router: Router, protected orb: OrbService, protected cdr: ChangeDetectorRef, ) { @@ -45,7 +44,6 @@ export class AgentViewComponent implements OnInit, OnDestroy { this.datasets = {}; this.groups = []; this.isLoading = true; - this.router.routeReuseStrategy.shouldReuseRoute = () => false; } ngOnInit() { From e39f5776b734e6df7c02b1dd299ebe8c063d67ab Mon Sep 17 00:00:00 2001 From: Luiz Pegoraro Date: Mon, 31 Jul 2023 10:40:26 -0300 Subject: [PATCH 17/83] feat: opentelemetry upgrade. --- agent/backend/diode/scrape.go | 4 ++-- agent/otel/otlpmqttexporter/factory.go | 4 ++-- go.mod | 18 +++++++++--------- maestro/config/config_builder.go | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/agent/backend/diode/scrape.go b/agent/backend/diode/scrape.go index c4a2d86e2..854707f91 100644 --- a/agent/backend/diode/scrape.go +++ b/agent/backend/diode/scrape.go @@ -6,6 +6,7 @@ package diode import ( "context" + "go.opentelemetry.io/otel/sdk/metric" "strconv" "time" @@ -15,7 +16,6 @@ import ( "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/otlpreceiver" - "go.opentelemetry.io/otel/metric/global" "go.opentelemetry.io/otel/trace" "go.uber.org/zap" ) @@ -73,7 +73,7 @@ func (d *diodeBackend) receiveOtlp() { TelemetrySettings: component.TelemetrySettings{ Logger: d.logger, TracerProvider: trace.NewNoopTracerProvider(), - MeterProvider: global.MeterProvider(), + MeterProvider: metric.NewMeterProvider(), }, BuildInfo: component.NewDefaultBuildInfo(), } diff --git a/agent/otel/otlpmqttexporter/factory.go b/agent/otel/otlpmqttexporter/factory.go index 1b371bdaf..44a8a2603 100644 --- a/agent/otel/otlpmqttexporter/factory.go +++ b/agent/otel/otlpmqttexporter/factory.go @@ -3,6 +3,7 @@ package otlpmqttexporter import ( "context" "fmt" + "go.opentelemetry.io/otel/sdk/metric" "github.com/orb-community/orb/agent/otel" "go.uber.org/zap" @@ -12,7 +13,6 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" - "go.opentelemetry.io/otel/metric/global" "go.opentelemetry.io/otel/trace" ) @@ -56,7 +56,7 @@ func CreateDefaultSettings(logger *zap.Logger) exporter.CreateSettings { TelemetrySettings: component.TelemetrySettings{ Logger: logger, TracerProvider: trace.NewNoopTracerProvider(), - MeterProvider: global.MeterProvider(), + MeterProvider: metric.NewMeterProvider(), }, BuildInfo: component.NewDefaultBuildInfo(), } diff --git a/go.mod b/go.mod index 5d5eed071..118af288e 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/mainflux/mainflux v0.0.0-20220415135135-92d8fb99bf82 github.com/mattn/go-sqlite3 v1.14.16 github.com/mitchellh/mapstructure v1.5.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.75.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.81.0 github.com/opentracing/opentracing-go v1.2.0 github.com/ory/dockertest/v3 v3.10.0 github.com/patrickmn/go-cache v2.1.0+incompatible @@ -56,10 +56,10 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/google/uuid v1.3.0 github.com/prometheus/common v0.44.0 // indirect - go.opentelemetry.io/collector v0.75.0 + go.opentelemetry.io/collector v0.81.0 go.opentelemetry.io/collector/pdata v1.0.0-rc9 - go.opentelemetry.io/otel/metric v0.37.0 - go.opentelemetry.io/otel/trace v1.14.0 + go.opentelemetry.io/otel/metric v1.16.0 + go.opentelemetry.io/otel/trace v1.16.0 google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 k8s.io/client-go v0.26.3 ) @@ -116,7 +116,7 @@ require ( github.com/nats-io/nkeys v0.4.4 // indirect github.com/nats-io/nuid v1.0.1 // indirect github.com/oklog/ulid/v2 v2.0.2 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.75.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.81.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.2 // indirect github.com/opencontainers/runc v1.1.5 // indirect @@ -186,8 +186,8 @@ require ( github.com/josharian/intern v1.0.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.75.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.62.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.81.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.81.0 github.com/orb-community/diode v0.0.0-20230419222319-4ec19ba89e9f github.com/pelletier/go-toml/v2 v2.0.6 // indirect github.com/pierrec/lz4/v4 v4.1.17 // indirect @@ -196,8 +196,8 @@ require ( github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.2 github.com/xdg-go/stringprep v1.0.4 // indirect - go.opentelemetry.io/collector/receiver/otlpreceiver v0.75.0 - go.opentelemetry.io/collector/semconv v0.75.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.81.0 + go.opentelemetry.io/collector/semconv v0.81.0 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0 // indirect k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect diff --git a/maestro/config/config_builder.go b/maestro/config/config_builder.go index 7ec609f19..2c41fec3c 100644 --- a/maestro/config/config_builder.go +++ b/maestro/config/config_builder.go @@ -296,7 +296,7 @@ var JsonDeployment = ` "containers": [ { "name": "otel-collector", - "image": "otel/opentelemetry-collector-contrib:0.75.0", + "image": "otel/opentelemetry-collector-contrib:0.81.0", "ports": [ { "containerPort": 13133, From 75e98eec00b177df5881e9602be89ca50e2d4ba4 Mon Sep 17 00:00:00 2001 From: Luiz Pegoraro Date: Mon, 31 Jul 2023 10:46:08 -0300 Subject: [PATCH 18/83] feat: opentelemetry upgrade. --- agent/backend/pktvisor/scrape.go | 4 ++-- sinker/otel/components.go | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/agent/backend/pktvisor/scrape.go b/agent/backend/pktvisor/scrape.go index 60089085d..d1d8b9fb0 100644 --- a/agent/backend/pktvisor/scrape.go +++ b/agent/backend/pktvisor/scrape.go @@ -21,7 +21,7 @@ import ( "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/otlpreceiver" - "go.opentelemetry.io/otel/metric/global" + "go.opentelemetry.io/otel/sdk/metric" "go.opentelemetry.io/otel/trace" "go.uber.org/zap" ) @@ -160,7 +160,7 @@ func (p *pktvisorBackend) receiveOtlp() { TelemetrySettings: component.TelemetrySettings{ Logger: p.logger, TracerProvider: trace.NewNoopTracerProvider(), - MeterProvider: global.MeterProvider(), + MeterProvider: metric.NewMeterProvider(), }, BuildInfo: component.NewDefaultBuildInfo(), } diff --git a/sinker/otel/components.go b/sinker/otel/components.go index 48a912ad7..6333f9054 100644 --- a/sinker/otel/components.go +++ b/sinker/otel/components.go @@ -14,7 +14,7 @@ import ( "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/processor" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/otel/metric/global" + "go.opentelemetry.io/otel/sdk/metric" "go.opentelemetry.io/otel/trace" "go.uber.org/zap" ) @@ -30,7 +30,7 @@ func StartOtelMetricsComponents(ctx context.Context, bridgeService *bridgeservic TelemetrySettings: component.TelemetrySettings{ Logger: logger, TracerProvider: trace.NewNoopTracerProvider(), - MeterProvider: global.MeterProvider(), + MeterProvider: metric.NewMeterProvider(), MetricsLevel: configtelemetry.LevelDetailed, }, BuildInfo: component.NewDefaultBuildInfo(), @@ -60,7 +60,7 @@ func StartOtelMetricsComponents(ctx context.Context, bridgeService *bridgeservic TelemetrySettings: component.TelemetrySettings{ Logger: logger, TracerProvider: trace.NewNoopTracerProvider(), - MeterProvider: global.MeterProvider(), + MeterProvider: metric.NewMeterProvider(), MetricsLevel: configtelemetry.LevelDetailed, }, } @@ -83,7 +83,7 @@ func StartOtelMetricsComponents(ctx context.Context, bridgeService *bridgeservic TelemetrySettings: component.TelemetrySettings{ Logger: logger, TracerProvider: trace.NewNoopTracerProvider(), - MeterProvider: global.MeterProvider(), + MeterProvider: metric.NewMeterProvider(), MetricsLevel: configtelemetry.LevelDetailed, }, } @@ -118,7 +118,7 @@ func StartOtelLogsComponents(ctx context.Context, bridgeService *bridgeservice.S TelemetrySettings: component.TelemetrySettings{ Logger: logger, TracerProvider: trace.NewNoopTracerProvider(), - MeterProvider: global.MeterProvider(), + MeterProvider: metric.NewMeterProvider(), MetricsLevel: configtelemetry.LevelDetailed, }, BuildInfo: component.NewDefaultBuildInfo(), @@ -148,7 +148,7 @@ func StartOtelLogsComponents(ctx context.Context, bridgeService *bridgeservice.S TelemetrySettings: component.TelemetrySettings{ Logger: logger, TracerProvider: trace.NewNoopTracerProvider(), - MeterProvider: global.MeterProvider(), + MeterProvider: metric.NewMeterProvider(), MetricsLevel: configtelemetry.LevelDetailed, }, } @@ -171,7 +171,7 @@ func StartOtelLogsComponents(ctx context.Context, bridgeService *bridgeservice.S TelemetrySettings: component.TelemetrySettings{ Logger: logger, TracerProvider: trace.NewNoopTracerProvider(), - MeterProvider: global.MeterProvider(), + MeterProvider: metric.NewMeterProvider(), MetricsLevel: configtelemetry.LevelDetailed, }, } @@ -206,7 +206,7 @@ func StartOtelTracesComponents(ctx context.Context, bridgeService *bridgeservice TelemetrySettings: component.TelemetrySettings{ Logger: logger, TracerProvider: trace.NewNoopTracerProvider(), - MeterProvider: global.MeterProvider(), + MeterProvider: metric.NewMeterProvider(), MetricsLevel: configtelemetry.LevelDetailed, }, BuildInfo: component.NewDefaultBuildInfo(), @@ -236,7 +236,7 @@ func StartOtelTracesComponents(ctx context.Context, bridgeService *bridgeservice TelemetrySettings: component.TelemetrySettings{ Logger: logger, TracerProvider: trace.NewNoopTracerProvider(), - MeterProvider: global.MeterProvider(), + MeterProvider: metric.NewMeterProvider(), MetricsLevel: configtelemetry.LevelDetailed, }, } @@ -259,7 +259,7 @@ func StartOtelTracesComponents(ctx context.Context, bridgeService *bridgeservice TelemetrySettings: component.TelemetrySettings{ Logger: logger, TracerProvider: trace.NewNoopTracerProvider(), - MeterProvider: global.MeterProvider(), + MeterProvider: metric.NewMeterProvider(), MetricsLevel: configtelemetry.LevelDetailed, }, } From 6fb8341eadf4cda87ddc0457f36573cbe5a354a1 Mon Sep 17 00:00:00 2001 From: Luiz Pegoraro Date: Mon, 31 Jul 2023 10:48:07 -0300 Subject: [PATCH 19/83] feat: opentelemetry upgrade. --- go.mod | 70 +++++++++++++-------- go.sum | 194 ++++++++++++++++++++++++++++++++------------------------- 2 files changed, 152 insertions(+), 112 deletions(-) diff --git a/go.mod b/go.mod index 118af288e..38bb62ea0 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/lib/pq v1.10.7 github.com/mainflux/mainflux v0.0.0-20220415135135-92d8fb99bf82 github.com/mattn/go-sqlite3 v1.14.16 - github.com/mitchellh/mapstructure v1.5.0 + github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.81.0 github.com/opentracing/opentracing-go v1.2.0 github.com/ory/dockertest/v3 v3.10.0 @@ -35,15 +35,21 @@ require ( github.com/spf13/viper v1.15.0 github.com/stretchr/testify v1.8.4 github.com/uber/jaeger-client-go v2.30.0+incompatible - go.opentelemetry.io/collector/component v0.75.0 + go.opentelemetry.io/collector/component v0.81.0 + go.opentelemetry.io/collector/config/confighttp v0.81.0 + go.opentelemetry.io/collector/config/configtelemetry v0.81.0 + go.opentelemetry.io/collector/config/configtls v0.81.0 go.opentelemetry.io/collector/confmap v0.81.0 - go.opentelemetry.io/collector/consumer v0.75.0 - go.opentelemetry.io/collector/exporter v0.75.0 - go.opentelemetry.io/collector/receiver v0.75.0 + go.opentelemetry.io/collector/consumer v0.81.0 + go.opentelemetry.io/collector/exporter v0.81.0 + go.opentelemetry.io/collector/processor v0.81.0 + go.opentelemetry.io/collector/receiver v0.81.0 + go.opentelemetry.io/otel/sdk/metric v0.39.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.24.0 - golang.org/x/exp v0.0.0-20230321023759-10a507213a29 - google.golang.org/grpc v1.54.0 + golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea + google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc + google.golang.org/grpc v1.56.1 google.golang.org/protobuf v1.31.0 gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 @@ -57,10 +63,10 @@ require ( github.com/google/uuid v1.3.0 github.com/prometheus/common v0.44.0 // indirect go.opentelemetry.io/collector v0.81.0 - go.opentelemetry.io/collector/pdata v1.0.0-rc9 - go.opentelemetry.io/otel/metric v1.16.0 + go.opentelemetry.io/collector/pdata v1.0.0-rcv0013 + go.opentelemetry.io/otel/metric v1.16.0 // indirect go.opentelemetry.io/otel/trace v1.16.0 - google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 + google.golang.org/genproto v0.0.0-20230525234025-438c736192d0 // indirect k8s.io/client-go v0.26.3 ) @@ -85,7 +91,7 @@ require ( github.com/go-gorp/gorp/v3 v3.1.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect - github.com/go-logr/logr v1.2.3 // indirect + github.com/go-logr/logr v1.2.4 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/google/go-cmp v0.5.9 // indirect @@ -95,11 +101,11 @@ require ( github.com/gorilla/websocket v1.5.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/iancoleman/strcase v0.2.0 // indirect - github.com/imdario/mergo v0.3.13 // indirect + github.com/imdario/mergo v0.3.15 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.16.5 // indirect + github.com/klauspost/compress v1.16.7 // indirect github.com/knadh/koanf v1.5.0 // indirect github.com/knadh/koanf/v2 v2.0.1 // indirect github.com/magiconair/properties v1.8.7 // indirect @@ -110,15 +116,16 @@ require ( github.com/moby/term v0.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/mostynb/go-grpc-compression v1.1.17 // indirect + github.com/mostynb/go-grpc-compression v1.2.0 // indirect github.com/nats-io/nats-server/v2 v2.9.20 // indirect github.com/nats-io/nats.go v1.27.0 // indirect github.com/nats-io/nkeys v0.4.4 // indirect github.com/nats-io/nuid v1.0.1 // indirect + github.com/observiq/ctimefmt v1.0.0 // indirect github.com/oklog/ulid/v2 v2.0.2 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.81.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect - github.com/opencontainers/image-spec v1.0.2 // indirect + github.com/opencontainers/image-spec v1.1.0-rc2 // indirect github.com/opencontainers/runc v1.1.5 // indirect github.com/ory/keto/proto/ory/keto/acl/v1alpha1 v0.0.0-20210616104402-80e043246cf9 // indirect github.com/pkg/errors v0.9.1 // indirect @@ -126,7 +133,7 @@ require ( github.com/prometheus/client_model v0.4.0 // indirect github.com/prometheus/procfs v0.10.1 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect - github.com/sirupsen/logrus v1.8.1 // indirect + github.com/sirupsen/logrus v1.9.0 // indirect github.com/spf13/afero v1.9.3 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect @@ -138,18 +145,27 @@ require ( github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.81.0 // indirect + go.opentelemetry.io/collector/config/configcompression v0.81.0 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.81.0 // indirect + go.opentelemetry.io/collector/config/confignet v0.81.0 // indirect + go.opentelemetry.io/collector/config/configopaque v0.81.0 // indirect + go.opentelemetry.io/collector/config/internal v0.81.0 // indirect + go.opentelemetry.io/collector/extension v0.81.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.81.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0013 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0 // indirect - go.opentelemetry.io/otel v1.14.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17 // indirect + go.opentelemetry.io/otel v1.16.0 // indirect + go.opentelemetry.io/otel/sdk v1.16.0 // indirect go.uber.org/atomic v1.10.0 // indirect - golang.org/x/crypto v0.9.0 // indirect + golang.org/x/crypto v0.10.0 // indirect golang.org/x/mod v0.9.0 // indirect - golang.org/x/net v0.10.0 // indirect + golang.org/x/net v0.11.0 // indirect golang.org/x/oauth2 v0.8.0 // indirect golang.org/x/sync v0.3.0 // indirect - golang.org/x/sys v0.8.0 // indirect - golang.org/x/term v0.8.0 // indirect - golang.org/x/text v0.9.0 // indirect + golang.org/x/sys v0.9.0 // indirect + golang.org/x/term v0.9.0 // indirect + golang.org/x/text v0.10.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.7.0 // indirect google.golang.org/appengine v1.6.7 // indirect @@ -164,7 +180,7 @@ require ( //These libs are used to allow orb extend opentelemetry features require ( github.com/Shopify/sarama v1.37.2 - github.com/apache/thrift v0.17.0 // indirect + github.com/apache/thrift v0.18.1 // indirect github.com/eapache/go-resiliency v1.3.0 // indirect github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect github.com/eapache/queue v1.1.0 // indirect @@ -177,7 +193,7 @@ require ( github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect - github.com/jaegertracing/jaeger v1.38.1 + github.com/jaegertracing/jaeger v1.41.0 github.com/jcmturner/aescts/v2 v2.0.0 // indirect github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect github.com/jcmturner/gofork v1.7.6 // indirect @@ -192,13 +208,13 @@ require ( github.com/pelletier/go-toml/v2 v2.0.6 // indirect github.com/pierrec/lz4/v4 v4.1.17 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect - github.com/rs/cors v1.8.3 // indirect + github.com/rs/cors v1.9.0 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.2 github.com/xdg-go/stringprep v1.0.4 // indirect go.opentelemetry.io/collector/receiver/otlpreceiver v0.81.0 go.opentelemetry.io/collector/semconv v0.81.0 - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect ) diff --git a/go.sum b/go.sum index 600b41528..61394f643 100644 --- a/go.sum +++ b/go.sum @@ -27,8 +27,8 @@ cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvf cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/compute v1.18.0 h1:FEigFqoDbys2cvFkZ9Fjq4gnHBP55anJ0yQyau2f9oY= -cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= +cloud.google.com/go/compute v1.20.0 h1:cUOcywWuowO9It2i1KX1lIb0HH7gLv6nENKuZGnlcSo= +cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 h1:aRVqY1p2IJaBGStWMsQMpkAa83cPkCDLl80eOj0Rbz4= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= @@ -54,6 +54,7 @@ github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF0 github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE= +github.com/Mottl/ctimefmt v0.0.0-20190803144728-fd2ac23a585a/go.mod h1:eyj2WSIdoPMPs2eNTLpSmM6Nzqo4V80/d6jHpnJ1SAI= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= @@ -73,8 +74,8 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk5 github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/apache/thrift v0.17.0 h1:cMd2aj52n+8VoAtvSvLn4kDC3aZ6IAkBuqWQ2IDu7wo= -github.com/apache/thrift v0.17.0/go.mod h1:OLxhMRJxomX+1I/KUw03qoV3mMz16BwaKI+d4fPBx7Q= +github.com/apache/thrift v0.18.1 h1:lNhK/1nqjbwbiOPDBPFJVKxgDEGSepKuTh6OLiXW8kg= +github.com/apache/thrift v0.18.1/go.mod h1:rdQn/dCcDKEWjjylUeueum4vQEjG2v8v2PqriUnbr+I= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= @@ -118,11 +119,8 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= @@ -168,8 +166,8 @@ github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5y github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= -github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/envoyproxy/protoc-gen-validate v0.10.1 h1:c0g45+xCJhdgFGw7a5QAfdS4byAbud7miNWJ1WwEVf8= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= @@ -181,7 +179,6 @@ github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= -github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= @@ -217,8 +214,8 @@ github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= -github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= +github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= @@ -408,13 +405,13 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1: github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= -github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= +github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM= +github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/jaegertracing/jaeger v1.38.1 h1:IunKLJl9Imgpxh3ZL+SD+E7KHYAkaeiOnjay9YeUl3o= -github.com/jaegertracing/jaeger v1.38.1/go.mod h1:T5RFOZgRQBXR9rpQq8HsiIg39gu0DAYGQbDzpKw9gU8= +github.com/jaegertracing/jaeger v1.41.0 h1:vVNky8dP46M2RjGaZ7qRENqylW+tBFay3h57N16Ip7M= +github.com/jaegertracing/jaeger v1.41.0/go.mod h1:SIkAT75iVmA9U+mESGYuMH6UQv6V9Qy4qxo0lwfCQAc= github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo= @@ -451,9 +448,8 @@ github.com/karrick/godirwalk v1.16.1 h1:DynhcF+bztK8gooS0+NDJFrdNZjJ3gzVzC545UNA github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= -github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI= -github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= +github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/knadh/koanf v1.5.0 h1:q2TSd/3Pyc/5yP9ldIrSdIz26MCcyNQzW0pEAugLPNs= github.com/knadh/koanf v1.5.0/go.mod h1:Hgyjp4y8v44hpZtPzs7JZfRAW5AhN7KfZcwv1RYggDs= github.com/knadh/koanf/v2 v2.0.1 h1:1dYGITt1I23x8cfx8ZnldtezdyaZtfAuRtIFOiRzK7g= @@ -466,7 +462,6 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= @@ -528,8 +523,9 @@ github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0Qu github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 h1:BpfhmLKZf+SjVanKKhCgf3bg+511DmU9eDQTen7LLbY= +github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= @@ -543,8 +539,8 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/mostynb/go-grpc-compression v1.1.17 h1:N9t6taOJN3mNTTi0wDf4e3lp/G/ON1TP67Pn0vTUA9I= -github.com/mostynb/go-grpc-compression v1.1.17/go.mod h1:FUSBr0QjKqQgoDG/e0yiqlR6aqyXC39+g/hFLDfSsEY= +github.com/mostynb/go-grpc-compression v1.2.0 h1:KJzRFSYPXlcoYjG5/xLZB8tpuOyWF2UnlW4tAuaWnfI= +github.com/mostynb/go-grpc-compression v1.2.0/go.mod h1:oidYvYyefMmhcuvU8fLJ8FfZyTyVzJ6SkmD5fIKgRe8= github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= @@ -563,6 +559,8 @@ github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnu github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= +github.com/observiq/ctimefmt v1.0.0 h1:r7vTJ+Slkrt9fZ67mkf+mA6zAdR5nGIJRMTzkUyvilk= +github.com/observiq/ctimefmt v1.0.0/go.mod h1:mxi62//WbSpG/roCO1c6MqZ7zQTvjVtYheqHN3eOjvc= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/ulid/v2 v2.0.2 h1:r4fFzBm+bv0wNKNh5eXTwU7i85y5x+uwkxCUTNVQqLc= github.com/oklog/ulid/v2 v2.0.2/go.mod h1:mtBL0Qe/0HAx6/a4Z30qxVIAL1eQDweXq5lxOEiwQ68= @@ -576,18 +574,18 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.23.0 h1:/oxKu9c2HVap+F3PfKort2Hw5DEU+HGlW8n+tguWsys= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.75.0 h1:XW4DBJP3+dgdclPVA7d9aetG/FBUmwSNQGWaWoZnyo0= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.75.0/go.mod h1:IyFOweK1oDRlcm4k+hdobQjvP5z3L5+5G7NBrQj1Kx0= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.75.0 h1:BqTK0DHxiJ2Jih/MCvt3qJJwi6SxyP8hLSpAElLVUHk= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.75.0/go.mod h1:XCBv1BOhtwwGmOBaPLtYelyVCLYAw5PwzyQKxZpsEkM= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.62.0 h1:Oy2PdppooZrcUiBqHAOHrKK+rk+/+wScXEPMVKdDkcc= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.62.0/go.mod h1:WgMWz7+zb5KKN6BDx8rL+88M73BxvjQiRsgK9yEavis= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.75.0 h1:8hSpocXftWJjo84a8E6Wa+ixOdgug3acVKblZbTM6sM= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.75.0/go.mod h1:BLIRUMliVdYdh6pFSNYRbbmShyqPr1sHwK/qYJSayx0= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.81.0 h1:sPjCHuqjn5UYDJOai4FulMCfLP+7AbspjHfv0jAtmD0= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.81.0/go.mod h1:moQ6krtZ8dyziij2P+9eao5+gBfCJjiNDwN7n2MZZs4= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.81.0 h1:Rb8e1O31dgjTEn6823RsPs2RaOwl7fVuFWz2qK9DRpY= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.81.0/go.mod h1:tnyFHqiWxeNUqAAaGuKDD7XDL0KwBMSqvRB9PsKCzng= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.81.0 h1:UCF4zWe24m1+yQeYGEQjzq5c9yNAf4d1lknbR7PAoH4= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.81.0/go.mod h1:/HK52N8ufi1rKuShEanBZVLVpOygLoIT9zqs0azKQ/s= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.81.0 h1:sVmU1X/9txOvdQX0VbnqwetrKThnsPXlJO52dmaFng8= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.81.0/go.mod h1:x71DNfrdvoQSN3AiovAsoSi4aG74Rary8oJATXzzkMw= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= -github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= -github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034= +github.com/opencontainers/image-spec v1.1.0-rc2/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ= github.com/opencontainers/runc v1.1.5 h1:L44KXEpKmfWDcS02aeGm8QNTFXTo2D+8MYGDIJ/GDEs= github.com/opencontainers/runc v1.1.5/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= @@ -610,7 +608,6 @@ github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCko github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= @@ -661,11 +658,10 @@ github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo= -github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rs/cors v1.9.0 h1:l9HGsTsHJcvW14Nk7J9KFz8bzeAWXn3CG6bgt7LsrAE= +github.com/rs/cors v1.9.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/rubenv/sql-migrate v1.1.1 h1:haR5Hn8hbW9/SpAICrXoZqXnywS7Q5WijwkQENPeNWY= github.com/rubenv/sql-migrate v1.1.1/go.mod h1:/7TZymwxN8VWumcIxw1jjHEcR1djpdkMHQPT4FWdnbQ= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -679,8 +675,9 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= +github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= @@ -766,39 +763,65 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.75.0 h1:j6gAYcrKydPyBUnHeUDbzCfMzytwkIN1WwPOXBmFSkI= -go.opentelemetry.io/collector v0.75.0/go.mod h1:5I49yghQpThAFWHtD78AURnWB/3MXVepVhAYfBMdDrc= -go.opentelemetry.io/collector/component v0.75.0 h1:+Sp5HPYhDMjmiBjFiOAuthbvqlKf8cE+ho8/WYEMAWQ= -go.opentelemetry.io/collector/component v0.75.0/go.mod h1:7PvmC6Vc1NDq63gYJvx6QeLW1ydRnjj7f1jLDITSbeI= +go.opentelemetry.io/collector v0.81.0 h1:pF+sB8xNXlg/W0a0QTLz4mUWyool1a9toVj8LmLoFqg= +go.opentelemetry.io/collector v0.81.0/go.mod h1:thuOTBMusXwcTPTwLbs3zwwCOLaaQX2g+Hjf8OObc/w= +go.opentelemetry.io/collector/component v0.81.0 h1:AKsl6bss/SRrW248GFpmGiiI/4kdemW92Ai/X82CCqY= +go.opentelemetry.io/collector/component v0.81.0/go.mod h1:+m6/yPiJ7O7Oc/OLfmgUB2mrY1xoUqRj4BsoOtIVpGs= +go.opentelemetry.io/collector/config/configauth v0.81.0 h1:NIiJuIGOdblN0EIJv64R2mvGhthcYfWuvyCnjk8HRN4= +go.opentelemetry.io/collector/config/configauth v0.81.0/go.mod h1:2KscbmU+8fIzwiSU9Kku0Tf4b4A1plqFIJXR1DWSaTw= +go.opentelemetry.io/collector/config/configcompression v0.81.0 h1:Q725pvVH7tR6BP3WK7Ro3pbqMeQdZEV3KeFVHchBxCc= +go.opentelemetry.io/collector/config/configcompression v0.81.0/go.mod h1:xhHm1sEH7BTECAJo1xn64NMxeIvZGKdVGdSKUUc+YuM= +go.opentelemetry.io/collector/config/configgrpc v0.81.0 h1:Q2xEE2SGbg79j3TdHT+781eUu/2uUIyrHVJAG9bLpVk= +go.opentelemetry.io/collector/config/configgrpc v0.81.0/go.mod h1:Frq/l2Ttbvm7cFH3hkxLdhl5TCNHcH6rnkpmi8U2kLY= +go.opentelemetry.io/collector/config/confighttp v0.81.0 h1:vIdiepUT7P/WtJRdfh8mjzvSqJRVF8/vl9GWtUNQlHQ= +go.opentelemetry.io/collector/config/confighttp v0.81.0/go.mod h1:I54THsffkpv//O7bUHw+0bXxjYdvyL6IHg5ksgYez8I= +go.opentelemetry.io/collector/config/confignet v0.81.0 h1:Eu8m3eX8GaGhOUc//YXvV4i3cEivxUSxkLnV1U9ydhg= +go.opentelemetry.io/collector/config/confignet v0.81.0/go.mod h1:unOg7BZvpt6T5xsf+LyeOQvUhD8ld/2AbfOsmUZ/bPM= +go.opentelemetry.io/collector/config/configopaque v0.81.0 h1:MkCAGh0WydRWydETB9FLnuCj9hDPDiz2g4Wxnl53I0w= +go.opentelemetry.io/collector/config/configopaque v0.81.0/go.mod h1:pM1oy6gasukw3H6jAvc9Q9OtFaaY2IbfeuwCPAjOgXc= +go.opentelemetry.io/collector/config/configtelemetry v0.81.0 h1:j3dhWbAcrfL1n0RmShRJf99X/xIMoPfEShN/5Z8bY0k= +go.opentelemetry.io/collector/config/configtelemetry v0.81.0/go.mod h1:KEYQRiYJdx38iZkvcLKBZWH9fK4NeafxBwGRrRKMgyA= +go.opentelemetry.io/collector/config/configtls v0.81.0 h1:2vt+yOZUvGq5ADqFAxL5ONm1ACuGXDSs87AWT54Ez4M= +go.opentelemetry.io/collector/config/configtls v0.81.0/go.mod h1:HMHTYBMMgqBpTvnNAhQYmjO7XuoBMe2T4qRHcKluB4Q= +go.opentelemetry.io/collector/config/internal v0.81.0 h1:wRV2PBnJygdmKpIdt/xfG7zdQvXvHz9L+z8MhGsOji4= +go.opentelemetry.io/collector/config/internal v0.81.0/go.mod h1:RKcLV1gQxhgwx+6rlPYsvGMq1RZNne3UeOUZkHxJnIg= go.opentelemetry.io/collector/confmap v0.81.0 h1:AqweoBGdF3jGM2/KgP5GS6bmN+1aVrEiCy4nPf7IBE4= go.opentelemetry.io/collector/confmap v0.81.0/go.mod h1:iCTnTqGgZZJumhJxpY7rrJz9UQ/0zjPmsJz2Z7Tp4RY= -go.opentelemetry.io/collector/consumer v0.75.0 h1:f+j560Enwrh1JHY+/dfVwidn9G/f+w0ZOx70tc0UTtg= -go.opentelemetry.io/collector/consumer v0.75.0/go.mod h1:ilbTs6xKJO+eknSor/9Q0CMed7mDSByOIbSh5khVFWY= -go.opentelemetry.io/collector/exporter v0.75.0 h1:ZOeUHUoRAstIS7xPh+vZ1a/6YO3cITJI0Ed1+XG8foA= -go.opentelemetry.io/collector/exporter v0.75.0/go.mod h1:wYSNU8OwTmnrgTK5bk84H++Ieqv4d+GVMR92wBsolJQ= +go.opentelemetry.io/collector/consumer v0.81.0 h1:8R2iCrSzD7T0RtC2Wh4GXxDiqla2vNhDokGW6Bcrfas= +go.opentelemetry.io/collector/consumer v0.81.0/go.mod h1:jS7+gAKdOx3lD3SnaBztBjUVpUYL3ee7fpoqI4p/gT8= +go.opentelemetry.io/collector/exporter v0.81.0 h1:GLhB8WGrBx+zZSB1HIOx2ivFUMahGtAVO2CC5xbCUHQ= +go.opentelemetry.io/collector/exporter v0.81.0/go.mod h1:Di4RTzI8uRooVNATIeApNUgmGdNt8XiikUTQLabmZaA= +go.opentelemetry.io/collector/extension v0.81.0 h1:Ak7AzZzxTFJxGyVbEklsGzqHyOHW5USiifJilCcRyTU= +go.opentelemetry.io/collector/extension v0.81.0/go.mod h1:DU2bX8qulS5+OCJZGfvqIwIT/q3sFnEjI2HjJ2LDI/s= +go.opentelemetry.io/collector/extension/auth v0.81.0 h1:UzVQSG9naJh1hX7hh+HVcvB3n+rpCJXX2BBdUoL/Ybo= +go.opentelemetry.io/collector/extension/auth v0.81.0/go.mod h1:PaBFcFrzXV+UgM4VZKp6Kn1IiRC/MbEYWxTfIalcIwk= go.opentelemetry.io/collector/featuregate v1.0.0-rcv0013 h1:tiTUG9X/gEDN1oDYQOBVUFYQfhUG2CvgW9VhBc2uk1U= go.opentelemetry.io/collector/featuregate v1.0.0-rcv0013/go.mod h1:0mE3mDLmUrOXVoNsuvj+7dV14h/9HFl/Fy9YTLoLObo= -go.opentelemetry.io/collector/pdata v1.0.0-rc9 h1:K1GND9w4hOMVE4lLpGt+0KvjIBcbsR54ZsijEyUQFFI= -go.opentelemetry.io/collector/pdata v1.0.0-rc9/go.mod h1:olBmmDzT077Jyag/kVDAaG9OFkzLF6zSm8mfufL4HW4= -go.opentelemetry.io/collector/receiver v0.75.0 h1:ZgoShBSTprt7vExTLtXTmEH05qIHU3tORhBWyk0PuB4= -go.opentelemetry.io/collector/receiver v0.75.0/go.mod h1:MADsPYeztg9cGUZIjmv5ayzntt69blxfmmZHlgdM1Aw= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.75.0 h1:VXOt3k/zB/R2SxFNJQTDWm/KifCMW60m8Q3O5E2TV2c= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.75.0/go.mod h1:DjuZIm8UHX5i3YEQFPi0XWbdNOSwFO9Xnm+WaB5wXzc= -go.opentelemetry.io/collector/semconv v0.75.0 h1:zIlZk+zh1bgc3VKE1PZEmhOaVa4tQHZMcFFUXmGekVs= -go.opentelemetry.io/collector/semconv v0.75.0/go.mod h1:xt8oDOiwa1jy24tGUo8+SzpphI7ZredS2WM/0m8rtTA= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0 h1:5jD3teb4Qh7mx/nfzq4jO2WFFpvXD0vYWFDrdvNWmXk= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0/go.mod h1:UMklln0+MRhZC4e3PwmN3pCtq4DyIadWw4yikh6bNrw= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0 h1:lE9EJyw3/JhrjWH/hEy9FptnalDQgj7vpbgC2KCCCxE= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0/go.mod h1:pcQ3MM3SWvrA71U4GDqv9UFDJ3HQsW7y5ZO3tDTlUdI= -go.opentelemetry.io/otel v1.14.0 h1:/79Huy8wbf5DnIPhemGB+zEPVwnN6fuQybr/SRXa6hM= -go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU= -go.opentelemetry.io/otel/exporters/prometheus v0.37.0 h1:NQc0epfL0xItsmGgSXgfbH2C1fq2VLXkZoDFsfRNHpc= -go.opentelemetry.io/otel/metric v0.37.0 h1:pHDQuLQOZwYD+Km0eb657A25NaRzy0a+eLyKfDXedEs= -go.opentelemetry.io/otel/metric v0.37.0/go.mod h1:DmdaHfGt54iV6UKxsV9slj2bBRJcKC1B1uvDLIioc1s= -go.opentelemetry.io/otel/sdk v1.14.0 h1:PDCppFRDq8A1jL9v6KMI6dYesaq+DFcDZvjsoGvxGzY= -go.opentelemetry.io/otel/sdk/metric v0.37.0 h1:haYBBtZZxiI3ROwSmkZnI+d0+AVzBWeviuYQDeBWosU= -go.opentelemetry.io/otel/trace v1.14.0 h1:wp2Mmvj41tDsyAJXiWDWpfNsOiIyd38fy85pyKcFq/M= -go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8= +go.opentelemetry.io/collector/pdata v1.0.0-rcv0013 h1:4sONXE9hAX+4Di8m0bQ/KaoH3Mi+OPt04cXkZ7A8W3k= +go.opentelemetry.io/collector/pdata v1.0.0-rcv0013/go.mod h1:x09G/4KjEcDKNuWCjC5ZtnuDE0XEqiRwI+yrHSVjIy8= +go.opentelemetry.io/collector/processor v0.81.0 h1:ypyNV5R0bnN3XGMAsH/q5eNARF5vXtFgSOK9rBWzsLc= +go.opentelemetry.io/collector/processor v0.81.0/go.mod h1:ZDwO3DVg1VUSA92g0r/o0jYk+T7r9uxgZZ3LABJbC34= +go.opentelemetry.io/collector/receiver v0.81.0 h1:0c+YtIV7fmd9ev+zmwS9qjx5ASi8cw+gSypu4I7Gugc= +go.opentelemetry.io/collector/receiver v0.81.0/go.mod h1:q80JkMxVLnk0vWxoTRY2J7F4Qx9069Yy5yxDbZ4JVwk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.81.0 h1:ewVbfATnAeQkwFK3r0dpFKCXcTb8HJKX4AixUioRt+c= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.81.0/go.mod h1:LGuSMVdOq5Zq+CEHF9YBHMaOIUZrzqW7DQGqo9g0dJA= +go.opentelemetry.io/collector/semconv v0.81.0 h1:lCYNNo3powDvFIaTPP2jDKIrBiV1T92NK4QgL/aHYXw= +go.opentelemetry.io/collector/semconv v0.81.0/go.mod h1:TlYPtzvsXyHOgr5eATi43qEMqwSmIziivJB2uctKswo= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17 h1:mdcNStUIXngF/mH3xxAo4nbR4g65IXqLL1SvYMjz7JQ= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17/go.mod h1:N2Nw/UmmvQn0yCnaUzvsWzTWIeffYIdFteg6mxqCWII= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 h1:pginetY7+onl4qN1vl0xW/V/v6OBZ0vVdH+esuJgvmM= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0/go.mod h1:XiYsayHc36K3EByOO6nbAXnAWbrUxdjUROCEeeROOH8= +go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= +go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= +go.opentelemetry.io/otel/exporters/prometheus v0.39.0 h1:whAaiHxOatgtKd+w0dOi//1KUxj3KoPINZdtDaDj3IA= +go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= +go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= +go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4= +go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI= +go.opentelemetry.io/otel/sdk/metric v0.39.0/go.mod h1:piDIRgjcK7u0HCL5pCA4e74qpK/jk3NiUoAHATVAmiI= +go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= +go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= @@ -825,8 +848,8 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= -golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= +golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM= +golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -837,8 +860,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= -golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea h1:vLCWI/yYrdEHyN2JzIzPO3aaQJHQdp89IZBA/+azVC4= +golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -917,8 +940,8 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220725212005-46097bf591d3/go.mod h1:AaygXjzTFtRAg2ttMY5RMuhpJ3cNnI0XpyFJD1iQRSM= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.11.0 h1:Gi2tvZIJyBtO9SDr1q9h5hEQCp/4L2RQ+ar0qjx2oNU= +golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1023,16 +1046,17 @@ golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s= +golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.9.0 h1:GRRCnKYhdQrD8kfRAdQ6Zcw1P0OcELxGLKJvtjVMZ28= +golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1045,8 +1069,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58= +golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1190,8 +1214,10 @@ google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaE google.golang.org/genproto v0.0.0-20210503173045-b96a97608f20/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA= -google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s= +google.golang.org/genproto v0.0.0-20230525234025-438c736192d0 h1:x1vNwUhVOcsYoKyEGCZBH694SBmmBjA2EfauFVEI2+M= +google.golang.org/genproto v0.0.0-20230525234025-438c736192d0/go.mod h1:9ExIQyXL5hZrHzQceCwuSYwZZ5QZBazOcprJ5rgs3lY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc h1:XSJ8Vk1SWuNr8S18z1NZSziL0CPIXLCCMDOEFtHBOFc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -1216,9 +1242,8 @@ google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag= -google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= +google.golang.org/grpc v1.56.1 h1:z0dNfjIl0VpaZ9iSVjA6daGatAYwPGstTjt5vkRMFkQ= +google.golang.org/grpc v1.56.1/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -1263,7 +1288,6 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools/v3 v3.3.0 h1:MfDY1b1/0xN1CyMlQDac0ziEy9zJQd9CXBRRDHw2jJo= From e16b71be4b6592b96344cd28092b56da333e6cc0 Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Mon, 31 Jul 2023 11:03:01 -0300 Subject: [PATCH 20/83] improvements(orb-ui): provisioning command copy button adjustments (#2540) --- ui/src/app/pages/fleet/agents/key/agent.key.component.html | 7 ++++--- ui/src/app/pages/fleet/agents/key/agent.key.component.ts | 6 ++++++ .../agent-provisioning/agent-provisioning.component.html | 2 +- .../agent-provisioning/agent-provisioning.component.scss | 5 +++++ .../agent-provisioning/agent-provisioning.component.ts | 3 +++ 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/ui/src/app/pages/fleet/agents/key/agent.key.component.html b/ui/src/app/pages/fleet/agents/key/agent.key.component.html index 17cb55a95..b3def31ac 100644 --- a/ui/src/app/pages/fleet/agents/key/agent.key.component.html +++ b/ui/src/app/pages/fleet/agents/key/agent.key.component.html @@ -18,7 +18,8 @@ 
       
       
       
diff --git a/ui/src/app/pages/fleet/agents/key/agent.key.component.ts b/ui/src/app/pages/fleet/agents/key/agent.key.component.ts
index c6b5e6b76..0715c0ecd 100644
--- a/ui/src/app/pages/fleet/agents/key/agent.key.component.ts
+++ b/ui/src/app/pages/fleet/agents/key/agent.key.component.ts
@@ -59,8 +59,14 @@ orbcommunity/orb-agent`;
   toggleIcon (target) {
     if (target === 'key') {
       this.copyKeyIcon = 'checkmark-outline';
+      setTimeout(() => {
+        this.copyKeyIcon = 'copy-outline';
+      }, 2000);
     } else if (target === 'command') {
       this.copyCommandIcon = 'checkmark-outline';
+      setTimeout(() => {
+        this.copyCommandIcon = "copy-outline";
+      }, 2000);
     }
   }
 
diff --git a/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.html b/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.html
index 71829bd94..992f267c0 100644
--- a/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.html
+++ b/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.html
@@ -30,7 +30,7 @@
         [cdkCopyToClipboard]="command2copy"
         ghost="true"
         (click)="toggleIcon('command')"
-        nbButton>
+        nbTooltip="Copy Provisioning Command">
         
         
diff --git a/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.scss b/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.scss
index 5ab7f622e..da2bdb0d6 100644
--- a/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.scss
+++ b/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.scss
@@ -100,3 +100,8 @@ nb-card {
     color: #df316f !important;
   }
 }
+button {
+  box-shadow: none !important;
+  outline: none !important;
+  margin-right: 15px;
+}
diff --git a/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.ts b/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.ts
index ead8c5035..c9ac54d60 100644
--- a/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.ts
+++ b/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.ts
@@ -38,6 +38,9 @@ export class AgentProvisioningComponent implements OnInit {
   toggleIcon(target) {
     if (target === "command") {
       this.copyCommandIcon = "checkmark-outline";
+      setTimeout(() => {
+        this.copyCommandIcon = "copy-outline";
+      }, 2000);
     }
   }
 

From 0f92069d9fd9fad6b03e7f5e35fd8f13e0b8b47d Mon Sep 17 00:00:00 2001
From: joaoguilherme2003 
Date: Mon, 31 Jul 2023 11:03:14 -0300
Subject: [PATCH 21/83] fix(orb-ui): Adjustments on forms create edit sink
 (#2539)

---
 .../orb/sink/sink-details/sink-details.component.html     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.html b/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.html
index 6bebef6e6..da7b6d6b1 100644
--- a/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.html
+++ b/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.html
@@ -65,7 +65,8 @@
                   fieldSize="medium"
                   formControlName="name"
                   fullWidth="true"
-                  nbInput/>
+                  nbInput
+                  [status]="formGroup?.controls.name.dirty  ? (!formGroup.controls.name.valid  ? 'danger' : 'success') : 'basic'"/>
                 

                   

-                    Name does not match the pattern.
+                    Name must start with a letter or "_" and contain only letters, numbers, "-" or "_"
@@ -114,7 +115,8 @@ fullWidth="true" required pattern="^[a-zA-Z_][a-zA-Z0-9_-]*$" - nbInput/> + nbInput + [status]="formGroup?.controls.name.dirty ? (!formGroup.controls.name.valid ? 'danger' : 'success') : 'basic'"/>
Date: Mon, 31 Jul 2023 11:03:27 -0300 Subject: [PATCH 22/83] fix(orb-ui) Uptade side menu when change pages (#2538) --- .../policies.agent/view/agent.policy.view.component.ts | 2 ++ ui/src/app/pages/fleet/agents/view/agent.view.component.ts | 2 ++ ui/src/app/pages/pages-menu.ts | 6 ++++++ ui/src/app/pages/sinks/view/sink.view.component.ts | 2 ++ 4 files changed, 12 insertions(+) diff --git a/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.ts b/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.ts index c060f8eb0..2f4555431 100644 --- a/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.ts +++ b/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.ts @@ -27,6 +27,7 @@ import { AgentGroup } from 'app/common/interfaces/orb/agent.group.interface'; import { filter } from 'rxjs/operators'; import { PolicyDuplicateComponent } from '../duplicate/agent.policy.duplicate.confirmation'; import { NbDialogService } from '@nebular/theme'; +import { updateMenuItems } from 'app/pages/pages-menu'; @Component({ selector: 'ngx-agent-view', @@ -71,6 +72,7 @@ export class AgentPolicyViewComponent implements OnInit, OnDestroy, OnChanges { ngOnInit() { this.fetchData(); + updateMenuItems('Policy Management'); } fetchData(newPolicyId?: any) { diff --git a/ui/src/app/pages/fleet/agents/view/agent.view.component.ts b/ui/src/app/pages/fleet/agents/view/agent.view.component.ts index 1bc273c29..6dc0c59d8 100644 --- a/ui/src/app/pages/fleet/agents/view/agent.view.component.ts +++ b/ui/src/app/pages/fleet/agents/view/agent.view.component.ts @@ -8,6 +8,7 @@ import { OrbService } from 'app/common/services/orb.service'; import { STRINGS } from 'assets/text/strings'; import { Observable, Subscription } from 'rxjs'; import { shareReplay } from 'rxjs/operators'; +import { updateMenuItems } from 'app/pages/pages-menu'; @Component({ selector: 'ngx-agent-view', @@ -49,6 +50,7 @@ export class AgentViewComponent implements OnInit, OnDestroy { ngOnInit() { this.agentID = this.route.snapshot.paramMap.get('id'); this.retrieveAgent(); + updateMenuItems('Agents'); } retrieveAgent() { diff --git a/ui/src/app/pages/pages-menu.ts b/ui/src/app/pages/pages-menu.ts index d54493670..be3ab77b0 100644 --- a/ui/src/app/pages/pages-menu.ts +++ b/ui/src/app/pages/pages-menu.ts @@ -48,3 +48,9 @@ export const MENU_ITEMS = [ ...MENU, ...environment.production ? [] : DEV_ITEMS, ]; + +export function updateMenuItems(pageName: string) { + MENU_ITEMS.forEach(item => { + item.selected = item.title === pageName; + }) +} diff --git a/ui/src/app/pages/sinks/view/sink.view.component.ts b/ui/src/app/pages/sinks/view/sink.view.component.ts index fc5cb1410..ec427b849 100644 --- a/ui/src/app/pages/sinks/view/sink.view.component.ts +++ b/ui/src/app/pages/sinks/view/sink.view.component.ts @@ -7,6 +7,7 @@ import { SinkConfigComponent } from 'app/shared/components/orb/sink/sink-config/ import { SinkDetailsComponent } from 'app/shared/components/orb/sink/sink-details/sink-details.component'; import { STRINGS } from 'assets/text/strings'; import { Subscription } from 'rxjs'; +import { updateMenuItems } from 'app/pages/pages-menu'; @Component({ selector: 'ngx-sink-view', @@ -42,6 +43,7 @@ export class SinkViewComponent implements OnInit, OnChanges, OnDestroy { ngOnInit(): void { this.fetchData(); + updateMenuItems('Sink Management'); } ngOnChanges(): void { From dded87ac8f6ad99f74c5762618919416a6b3e1e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jul 2023 21:25:28 +0000 Subject: [PATCH 23/83] fix: bump selenium from 4.10.0 to 4.11.0 Bumps [selenium](https://github.com/SeleniumHQ/Selenium) from 4.10.0 to 4.11.0. - [Release notes](https://github.com/SeleniumHQ/Selenium/releases) - [Commits](https://github.com/SeleniumHQ/Selenium/compare/selenium-4.10.0...selenium-4.11.0) --- updated-dependencies: - dependency-name: selenium dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- python-test/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-test/requirements.txt b/python-test/requirements.txt index 857375998..7877ef55e 100644 --- a/python-test/requirements.txt +++ b/python-test/requirements.txt @@ -4,7 +4,7 @@ docker==6.1.3 PyHamcrest==2.0.4 PyYAML==6.0 retry==0.9.2 -selenium==4.10.0 +selenium==4.11.0 behavex==2.0.1 deepdiff==6.3.0 jsonschema==4.18.4 From 6f0a00f471467b2bf31d55329e61d76d743a7946 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jul 2023 21:26:05 +0000 Subject: [PATCH 24/83] fix: bump mkdocs-material from 9.1.18 to 9.1.21 Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.1.18 to 9.1.21. - [Release notes](https://github.com/squidfunk/mkdocs-material/releases) - [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG) - [Commits](https://github.com/squidfunk/mkdocs-material/compare/9.1.18...9.1.21) --- updated-dependencies: - dependency-name: mkdocs-material dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- python-test/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-test/requirements.txt b/python-test/requirements.txt index 857375998..4bdce58e1 100644 --- a/python-test/requirements.txt +++ b/python-test/requirements.txt @@ -9,7 +9,7 @@ behavex==2.0.1 deepdiff==6.3.0 jsonschema==4.18.4 mkdocs==1.4.3 -mkdocs-material==9.1.18 +mkdocs-material==9.1.21 prometheus-client==0.17.0 psutil==5.9.5 webdriver-manager==3.9.1 From 8a4a0e5c553a443c4f1a945fad0517e5d9e9917d Mon Sep 17 00:00:00 2001 From: manrodrigues Date: Mon, 31 Jul 2023 19:05:27 -0300 Subject: [PATCH 25/83] Update agent.key.component.html (#2549) --- ui/src/app/pages/fleet/agents/key/agent.key.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/app/pages/fleet/agents/key/agent.key.component.html b/ui/src/app/pages/fleet/agents/key/agent.key.component.html index b3def31ac..77ce461dd 100644 --- a/ui/src/app/pages/fleet/agents/key/agent.key.component.html +++ b/ui/src/app/pages/fleet/agents/key/agent.key.component.html @@ -19,7 +19,7 @@
-
+
- + + + +
@@ -25,7 +33,15 @@ [(ngModel)]="code" [options]="editorOptions" class="code-editor" - ngDefaultControl> + ngDefaultControl + *ngIf="!isYaml"> + +
diff --git a/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.scss b/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.scss index 0abd319d2..3aa8fb22b 100644 --- a/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.scss +++ b/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.scss @@ -8,8 +8,29 @@ nb-card { width: 50vw; min-width: 340px; } -@media (max-width: 1500px) { +@media (max-width: 1550px) { nb-card { - width: 35vw; + width: 40vw; } } +.switch-button { + color: #3089fc; + background-color: transparent; + border: none; + font-weight: 600; + outline: none; + margin-right: 20px; + margin-top: 7px; + display: inline-block; +} +.switch-button:hover { + color: #75a5e2; +} +.flex { + display: flex; + justify-content: space-between; + align-items: center; +} +.align-items { + margin-left: auto; +} diff --git a/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.ts b/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.ts index a03960e1b..bb52311b6 100644 --- a/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.ts +++ b/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.ts @@ -1,7 +1,9 @@ import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core'; import { FormBuilder, FormControl, Validators } from '@angular/forms'; import { Sink, SinkBackends } from 'app/common/interfaces/orb/sink.interface'; +import * as YAML from 'yaml'; import IStandaloneEditorConstructionOptions = monaco.editor.IStandaloneEditorConstructionOptions; + @Component({ selector: 'ngx-sink-config', templateUrl: './sink-config.component.html', @@ -48,7 +50,16 @@ export class SinkConfigComponent implements OnInit, OnChanges { lineDecorationsWidth: 0, lineNumbersMinChars: 0, }; - + editorOptionsYaml = { + theme: 'vs-dark', + language: 'yaml', + automaticLayout: true, + glyphMargin: false, + folding: true, + lineDecorationsWidth: 0, + lineNumbersMinChars: 0, + readOnly: true, + }; code = ''; sinkConfigSchemaPrometheus: any; @@ -57,7 +68,10 @@ export class SinkConfigComponent implements OnInit, OnChanges { formControl: FormControl; + isYaml: boolean; + constructor(private fb: FormBuilder) { + this.isYaml = false; this.sink = {}; this.editMode = false; this.editModeChange = new EventEmitter(); @@ -92,40 +106,74 @@ export class SinkConfigComponent implements OnInit, OnChanges { this.code = JSON.stringify(this.sinkConfigSchemaOtlp, null, 2); } else { - this.code = JSON.stringify(this.sink.config, null, 2); - } - } - - ngOnChanges(changes: SimpleChanges) { - if (changes?.editMode && !changes?.editMode.firstChange) { - this.toggleEdit(changes.editMode.currentValue, false); - } - if (changes?.sinkBackend) { - if (this.sinkBackend === SinkBackends.prometheus) { - this.code = JSON.stringify(this.sinkConfigSchemaPrometheus, null, 2); + if (this.sink.config_data && this.sink.format === 'yaml') { + this.isYaml = true; + this.code = YAML.stringify(this.sink.config_data); } - else { - this.code = JSON.stringify(this.sinkConfigSchemaOtlp, null, 2); + else if (this.isJson(JSON.stringify(this.sink.config))) { + this.isYaml = false; + this.code = JSON.stringify(this.sink.config, null, 2); } + } } - - updateForm() { - const { config } = this.sink; - if (this.editMode) { - this.code = JSON.stringify(config, null, 2); - this.formControl = this.fb.control(this.code, [Validators.required]); - } else { - this.formControl = this.fb.control(null, [Validators.required]); - this.code = JSON.stringify(config, null, 2); + isJson(str: string) { + try { + JSON.parse(str); + return true; + } catch { + return false; } +} +ngOnChanges(changes: SimpleChanges) { + const { editMode, sinkBackend } = changes; + if (editMode && !editMode.firstChange) { + this.toggleEdit(editMode.currentValue, false); + } + if (sinkBackend) { + const sinkConfigSchema = this.sinkBackend === SinkBackends.prometheus + ? this.sinkConfigSchemaPrometheus + : this.sinkConfigSchemaOtlp; + + this.code = this.isYaml + ? YAML.stringify(sinkConfigSchema, null) + : JSON.stringify(sinkConfigSchema, null, 2); + } +} + +updateForm() { + const configData = this.sink.config_data; + const isYamlFormat = this.sink.format === 'yaml'; + + if (this.editMode) { + this.isYaml = isYamlFormat; + this.code = isYamlFormat ? YAML.stringify(configData) : JSON.stringify(this.sink.config, null, 2); + } else { + this.formControl = this.fb.control(null, [Validators.required]); + this.isYaml = isYamlFormat; + this.code = isYamlFormat ? YAML.stringify(configData) : JSON.stringify(this.sink.config, null, 2); } + this.formControl = this.fb.control(this.code, [Validators.required]); +} + toggleEdit(edit, notify = true) { this.editMode = edit; this.editorOptions = { ...this.editorOptions, readOnly: !edit }; + this.editorOptionsYaml = { ...this.editorOptionsYaml, readOnly: !edit }; this.updateForm(); !!notify && this.editModeChange.emit(this.editMode); } - + toggleLanguage() { + this.isYaml = !this.isYaml; + if (this.isYaml) { + const parsedCode = YAML.parse(this.code); + this.code = YAML.stringify(parsedCode); + } + else { + const parsedConfig = YAML.parse(this.code); + this.code = JSON.stringify(parsedConfig, null, 2); + } + } + } diff --git a/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.html b/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.html index da7b6d6b1..7ca6afac9 100644 --- a/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.html +++ b/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.html @@ -119,7 +119,7 @@ [status]="formGroup?.controls.name.dirty ? (!formGroup.controls.name.valid ? 'danger' : 'success') : 'basic'"/>
Name is required. From 0cbdc1c88b4fc91373ba258429bf0c2a5dc14df9 Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Mon, 7 Aug 2023 13:32:26 -0300 Subject: [PATCH 31/83] feat(orb-ui):#955 Policy add, remove forms piece and add json editor (#2552) --- .../add/agent.policy.add.component.html | 347 ++------------ .../add/agent.policy.add.component.ts | 438 ++++-------------- 2 files changed, 132 insertions(+), 653 deletions(-) diff --git a/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.html b/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.html index 84c3264f7..f0d6f75ba 100644 --- a/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.html +++ b/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.html @@ -17,7 +17,8 @@

{{ isEdit ? 'Edit Agent Policy' : 'Create Agent Policy'}}

+ orientation="vertical" + style="margin-right: 50px !important;"> {{ isEdit ? 'Edit Agent Policy' : 'Create Agent Policy'}}

-
- -
+ +
+
-
- -
- -
-
-
-
- -
-
- - - {{ control.value.name + "-" + control.value.props.options }} - {{ option.value }} - -
-
-
-
-
+
+ +
-
-
+
+

Paste or Upload your YAML configuration

-
- - - -
- - - -
- Add Data Handlers -

Setup any number of handlers

-
- - -
- - - {{ handler.key }} - - - - No Handler Added. - - - -
-
-
-
+

Paste or Upload your YAML configuration

-
- - - + status="danger"> + Cancel + + +
- - - - +
+ + +
+
+ + +
+ +
\ No newline at end of file diff --git a/ui/src/app/pages/sinks/add/sink-add.component.scss b/ui/src/app/pages/sinks/add/sink-add.component.scss index 26a9a5e11..197713347 100644 --- a/ui/src/app/pages/sinks/add/sink-add.component.scss +++ b/ui/src/app/pages/sinks/add/sink-add.component.scss @@ -34,9 +34,21 @@ button { } .row { - gap: 1rem; + display: flex; + gap: 10px; } + .card-col { + flex-grow: 1; + } + + @media (min-width: 768px) { + .card-col { + min-width: 370px !important; + } + } + + header { justify-content: space-between; } diff --git a/ui/src/app/pages/sinks/view/sink.view.component.html b/ui/src/app/pages/sinks/view/sink.view.component.html index 9d7dbcc69..f3cf57056 100644 --- a/ui/src/app/pages/sinks/view/sink.view.component.html +++ b/ui/src/app/pages/sinks/view/sink.view.component.html @@ -1,5 +1,5 @@
-
+

{{ strings.sink.view.header }}

-
- - + + +
+
-
- - - - +
+
+ + +
+
+ + +
diff --git a/ui/src/app/pages/sinks/view/sink.view.component.scss b/ui/src/app/pages/sinks/view/sink.view.component.scss index ecaaab348..bb3593d22 100644 --- a/ui/src/app/pages/sinks/view/sink.view.component.scss +++ b/ui/src/app/pages/sinks/view/sink.view.component.scss @@ -2,7 +2,6 @@ button { margin: 0 3px; &.policy-duplicate { - float: right; color: #fff !important; font-family: "Montserrat", sans-serif; font-weight: 700; @@ -18,7 +17,6 @@ button { } &.policy-save { - float: right; color: #fff !important; font-family: "Montserrat", sans-serif; font-weight: 700; @@ -34,7 +32,6 @@ button { } &.policy-discard { - float: right; color: #fff !important; font-family: "Montserrat", sans-serif; font-weight: 700; @@ -62,11 +59,21 @@ ngx-sink-config { height: 30rem !important; } } - .row { + display: flex; gap: 10px; } +.card-col { + flex-grow: 1; +} + +@media (min-width: 768px) { + .card-col { + min-width: 370px !important; + } +} + header { justify-content: space-between; } diff --git a/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.scss b/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.scss index 038311ef5..7282571c3 100644 --- a/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.scss +++ b/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.scss @@ -6,7 +6,7 @@ ngx-monaco-editor { } nb-card { width: 50vw; - min-width: 340px; + min-width: 500px; } @media (max-width: 1550px) { nb-card { diff --git a/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.scss b/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.scss index d2309cb27..32d1dae22 100644 --- a/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.scss +++ b/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.scss @@ -30,8 +30,6 @@ input { .ns1red { color: #df316f; } - nb-card { - width: 22vw; - min-width: 370px; + min-width: 368px; } \ No newline at end of file diff --git a/ui/src/app/shared/components/orb/tag-control/tag-control.component.html b/ui/src/app/shared/components/orb/tag-control/tag-control.component.html index 3153d5de3..63d593f76 100644 --- a/ui/src/app/shared/components/orb/tag-control/tag-control.component.html +++ b/ui/src/app/shared/components/orb/tag-control/tag-control.component.html @@ -65,7 +65,7 @@
+ style="transform: translateY(14px); white-space: nowrap;">
diff --git a/ui/src/app/shared/components/orb/tag-display/tag-display.component.html b/ui/src/app/shared/components/orb/tag-display/tag-display.component.html index de8d4d22f..c906a9579 100644 --- a/ui/src/app/shared/components/orb/tag-display/tag-display.component.html +++ b/ui/src/app/shared/components/orb/tag-display/tag-display.component.html @@ -1,19 +1,23 @@ - - - {{tag | tagchip}} - - - No tag added - - +
+ + + {{ tag.key }}:  + {{ tag.value }} + + + No tag added + + +
+ diff --git a/ui/src/app/shared/components/orb/tag-display/tag-display.component.scss b/ui/src/app/shared/components/orb/tag-display/tag-display.component.scss index d4536e7ab..de33ba747 100644 --- a/ui/src/app/shared/components/orb/tag-display/tag-display.component.scss +++ b/ui/src/app/shared/components/orb/tag-display/tag-display.component.scss @@ -1,3 +1,9 @@ mat-chip nb-icon { font-size: 1rem; } +.background { + background-color: #232940; + padding: 10px; + border-radius: 8px; + margin-bottom: 20px; +} diff --git a/ui/src/app/shared/pipes/tag-color.pipe.ts b/ui/src/app/shared/pipes/tag-color.pipe.ts index f94ba3f2c..456bcdf55 100644 --- a/ui/src/app/shared/pipes/tag-color.pipe.ts +++ b/ui/src/app/shared/pipes/tag-color.pipe.ts @@ -12,8 +12,8 @@ export class TagColorPipe implements PipeTransform { * @param tagList {> | string} * @return {} */ - transform(tag: string | KeyValue): string { - const value = typeof tag === 'string' ? tag : tag.key; + transform(tag: string): string { + const value = tag; if (value !== '') { const h = Math.abs( `${value}}` From 1314fe0a270367c2d631266d96e7b83c3c3e5fe6 Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Thu, 17 Aug 2023 10:26:48 -0300 Subject: [PATCH 40/83] improvement(orb-ui): Agent view, improve header state (#2572) --- .../fleet/agents/view/agent.view.component.html | 17 +++++++++++------ .../fleet/agents/view/agent.view.component.scss | 15 +++++++++++++++ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/ui/src/app/pages/fleet/agents/view/agent.view.component.html b/ui/src/app/pages/fleet/agents/view/agent.view.component.html index 3cd7c0e11..748b11066 100644 --- a/ui/src/app/pages/fleet/agents/view/agent.view.component.html +++ b/ui/src/app/pages/fleet/agents/view/agent.view.component.html @@ -4,7 +4,7 @@

Agent View

-
+
@@ -13,9 +13,15 @@ Last Update: {{ lastUpdate | date: 'HH:mm:ss a' }}
-
- - {{ agent?.state | ngxCapitalize }}.   +
+
+ + + + {{ agent?.state | ngxCapitalize }} + +
+
Last activity @@ -28,9 +34,8 @@ This Agent has been provisioned but never connected. - +
-
diff --git a/ui/src/app/pages/fleet/agents/view/agent.view.component.scss b/ui/src/app/pages/fleet/agents/view/agent.view.component.scss index e001af077..15c572b3b 100644 --- a/ui/src/app/pages/fleet/agents/view/agent.view.component.scss +++ b/ui/src/app/pages/fleet/agents/view/agent.view.component.scss @@ -198,3 +198,18 @@ nb-card { color: #969fb9; font-size: 14px; } +.state { + font-size: 15px; + font-weight: 700; +} +.fa.fa-circle { + font-size: 11px; +} +.offline-circle { + width: 10px; + height: 10px; + border: 2px solid #969fb9; + border-radius: 50%; + background-color: transparent; +} + From 754df5f875268e821a1bb8814da6d9629be521e2 Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Thu, 17 Aug 2023 14:12:19 -0300 Subject: [PATCH 41/83] feat(orb-ui): #1031 edit option on Agent View (#2573) --- ui/src/app/@theme/styles/_overrides.scss | 6 +- .../agents/view/agent.view.component.html | 2 +- .../fleet/agents/view/agent.view.component.ts | 6 + .../agent-information.component.html | 146 ++++++++++++++---- .../agent-information.component.scss | 19 +++ .../agent-information.component.ts | 73 ++++++++- 6 files changed, 214 insertions(+), 38 deletions(-) diff --git a/ui/src/app/@theme/styles/_overrides.scss b/ui/src/app/@theme/styles/_overrides.scss index 2135b58a2..5a0c952d5 100644 --- a/ui/src/app/@theme/styles/_overrides.scss +++ b/ui/src/app/@theme/styles/_overrides.scss @@ -194,4 +194,8 @@ &offline { color: #969fb9; } -} \ No newline at end of file +} +.required { + color: #df316f; + padding-left: 2px; +} diff --git a/ui/src/app/pages/fleet/agents/view/agent.view.component.html b/ui/src/app/pages/fleet/agents/view/agent.view.component.html index 748b11066..8c929a8f4 100644 --- a/ui/src/app/pages/fleet/agents/view/agent.view.component.html +++ b/ui/src/app/pages/fleet/agents/view/agent.view.component.html @@ -40,7 +40,7 @@
- +
diff --git a/ui/src/app/pages/fleet/agents/view/agent.view.component.ts b/ui/src/app/pages/fleet/agents/view/agent.view.component.ts index 6dc0c59d8..3ce6556de 100644 --- a/ui/src/app/pages/fleet/agents/view/agent.view.component.ts +++ b/ui/src/app/pages/fleet/agents/view/agent.view.component.ts @@ -88,4 +88,10 @@ export class AgentViewComponent implements OnInit, OnDestroy { this.isLoading = true; this.retrieveAgent(); } + + onRefreshRequests(value: boolean) { + if (value) { + this.refreshAgent(); + } + } } diff --git a/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.html b/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.html index 5feb0906a..0e76a6698 100644 --- a/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.html +++ b/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.html @@ -1,41 +1,119 @@ - Agent Information - -
-
- -

{{ agent?.name }}

+ + Agent Information + + + -
-
-
- -

{{ getAgentVersion() }}

-

Agent never connected

-
-
-
- -

{{ agent?.id }}

+ + +
+ + - -

{{ agent?.channel_id }}

+ +
+
+ +

{{ agent?.name }}

- -

{{ agent?.ts_created | date:'full'}}

+
+
+
+ +

{{ getAgentVersion() }}

+

Agent never connected

- - -
- +
+ +

{{ agent?.id }}

+ + +

{{ agent?.channel_id }}

+ + +

{{ agent?.ts_created | date:'full'}}

- - +
+ + +
+ +
+ + + +
+
+ +
+
+ + * +
+ +
+
+ Name is required. +
+
+ Name must start with a letter or "_" and contain only letters, numbers, "-" or "_" +
+
+ Name must not exceed 64 characters. +
+
+ Name too short. +
+
+
+ +
+ + +
+ + diff --git a/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.scss b/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.scss index 8da3a3f6c..c98f332c2 100644 --- a/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.scss +++ b/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.scss @@ -60,6 +60,11 @@ nb-card { } } } +nb-form-field { + label { + color: #fff !important; + } +} ::ng-deep { @@ -116,7 +121,21 @@ nb-card { color: #df316f !important; } } +.agent-save { + float: right; + color: #fff !important; + font-family: 'Montserrat', sans-serif; + font-weight: 700; + text-transform: none !important; + margin-left: 5px; + &.btn-disabled { + background: #2b3148; + } + &:not(.btn-disabled) { + background-color: #3089fc !important; + } +} .agent-reset { float: right; color: #fff !important; diff --git a/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.ts b/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.ts index e03f51769..7cf53f43c 100644 --- a/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.ts +++ b/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.ts @@ -1,5 +1,7 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, EventEmitter, Input, OnInit, Output, SimpleChanges } from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Agent, AgentStates } from 'app/common/interfaces/orb/agent.interface'; +import { Tags } from 'app/common/interfaces/orb/tag'; import { AgentsService } from 'app/common/services/agents/agents.service'; import { NotificationsService } from 'app/common/services/notifications/notifications.service'; @@ -15,15 +17,59 @@ export class AgentInformationComponent implements OnInit { agentStates = AgentStates; + editMode: boolean; + + formGroup: FormGroup; + + selectedTags: Tags; + + @Output() + refreshRequests = new EventEmitter(); + constructor( protected agentsService: AgentsService, protected notificationService: NotificationsService, + private fb: FormBuilder, ) { this.isResetting = false; + this.editMode = false; + this.updateForm(); } - ngOnInit(): void {} + ngOnInit(): void { + this.selectedTags = this.agent?.orb_tags || {}; + } + updateForm() { + if (this.editMode) { + const { name, orb_tags } = this.agent; + this.formGroup = this.fb.group({ + name: [ + name, + [ + Validators.required, + Validators.pattern('^[a-zA-Z_][a-zA-Z0-9_-]*$'), + Validators.maxLength(64), + Validators.minLength(2), + ], + ], + }); + this.selectedTags = {...orb_tags} || {}; + } else { + this.formGroup = this.fb.group({ + name: null, + }); + } + } + ngOnChanges(changes: SimpleChanges) { + if (changes?.editMode) { + this.toggleEdit(changes.editMode.currentValue); + } + if (changes?.policy) { + this.selectedTags = this.agent?.orb_tags || {}; + } + } + resetAgent() { if (!this.isResetting) { this.isResetting = true; @@ -43,4 +89,27 @@ export class AgentInformationComponent implements OnInit { notifyResetSuccess() { this.notificationService.success('Agent Reset Requested', ''); } + toggleEdit(value) { + this.editMode = value; + this.updateForm(); + } + canSave() { + if (this.formGroup.status === 'VALID') { + return true; + } + return false; + } + save () { + const name = this.formGroup.controls.name.value; + const payload = { + name: name, + orb_tags: { ...this.selectedTags }, + } + this.agentsService.editAgent({ ...payload, id: this.agent.id }).subscribe(() => { + this.notificationService.success('Agent successfully updated', ''); + this.refreshRequests.emit(true); + this.editMode = false; + }); + + } } From 5ac284ebff4cb117b9d724ece62f07838280ce31 Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Fri, 18 Aug 2023 13:10:50 -0300 Subject: [PATCH 42/83] improvement(orb-ui): #83 Enter key adds a tag (#2575) --- .../agent-information/agent-information.component.html | 2 +- .../components/orb/tag-control/tag-control.component.html | 6 ++++-- .../components/orb/tag-control/tag-control.component.ts | 6 +++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.html b/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.html index 0e76a6698..3f6b62bcc 100644 --- a/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.html +++ b/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.html @@ -112,7 +112,7 @@
- +
diff --git a/ui/src/app/shared/components/orb/tag-control/tag-control.component.html b/ui/src/app/shared/components/orb/tag-control/tag-control.component.html index c8cf0a615..ee6cabad4 100644 --- a/ui/src/app/shared/components/orb/tag-control/tag-control.component.html +++ b/ui/src/app/shared/components/orb/tag-control/tag-control.component.html @@ -43,7 +43,8 @@ name="key" [(ngModel)]="key" fullWidth="true" - nbInput/> + nbInput + (keyup.enter)="onEnter()"/>
@@ -64,7 +65,8 @@ fullWidth="true" required ngxEmptyInput - nbInput/> + nbInput + (keyup.enter)="onEnter()"/>
Date: Fri, 18 Aug 2023 13:10:59 -0300 Subject: [PATCH 43/83] fix(orb-ui): #1022 add profile and log out icons (#2574) --- ui/src/app/@theme/components/header/header.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/src/app/@theme/components/header/header.component.ts b/ui/src/app/@theme/components/header/header.component.ts index b44d4a0c6..03cb07ef3 100644 --- a/ui/src/app/@theme/components/header/header.component.ts +++ b/ui/src/app/@theme/components/header/header.component.ts @@ -39,8 +39,8 @@ export class HeaderComponent implements OnInit, OnDestroy { // Mainflux - Menu and version userMenu = [ - {title: 'Profile', link: '/pages/profile'}, - {title: 'Log out', link: '/auth/logout'}, + {title: 'Profile', link: '/pages/profile', icon: 'person-outline'}, + {title: 'Log Out', link: '/auth/logout', icon: 'log-out-outline'}, ]; version = '0.0.0'; From 84aa8912288edcad645cdd4b594aecc00381ea55 Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Tue, 22 Aug 2023 14:30:16 -0300 Subject: [PATCH 44/83] improvement(orb-ui): include delete button on view pages (#2579) --- ui/src/app/@theme/styles/_overrides.scss | 21 ++++++++++++++ .../list/agent.policy.list.component.html | 2 +- .../view/agent.policy.view.component.html | 29 ++++++++++++------- .../view/agent.policy.view.component.ts | 24 +++++++++++++++ .../agents/list/agent.list.component.html | 2 +- .../agents/view/agent.view.component.html | 8 ++++- .../fleet/agents/view/agent.view.component.ts | 28 +++++++++++++++++- .../list/agent.group.list.component.html | 2 +- .../pages/sinks/list/sink.list.component.html | 2 +- .../pages/sinks/view/sink.view.component.html | 18 +++++++++--- .../pages/sinks/view/sink.view.component.ts | 26 ++++++++++++++++- .../agent-information.component.html | 4 ++- .../agent-information.component.scss | 8 +++-- .../policy-details.component.html | 3 +- .../policy-interface.component.html | 3 +- .../sink-config/sink-config.component.html | 3 +- .../sink-config/sink-config.component.scss | 7 +---- .../sink-details/sink-details.component.html | 3 +- .../sink-details/sink-details.component.ts | 1 - 19 files changed, 157 insertions(+), 37 deletions(-) diff --git a/ui/src/app/@theme/styles/_overrides.scss b/ui/src/app/@theme/styles/_overrides.scss index 5a0c952d5..fcbd2ac44 100644 --- a/ui/src/app/@theme/styles/_overrides.scss +++ b/ui/src/app/@theme/styles/_overrides.scss @@ -142,17 +142,38 @@ } .card-button { + border-radius: 15px !important; + float: right !important; + color: #3089fc !important; + font-family: 'Montserrat', sans-serif; + font-weight: 600; + text-transform: none !important; + background-color: transparent !important; + + &.btn-disabled { + background: #2b3148; + } +} +.card-button:hover { + background-color: #171c30 !important; +} + +.add-button { border-radius: 15px !important; float: right !important; color: #fff !important; font-family: 'Montserrat', sans-serif; font-weight: 600; text-transform: none !important; + background-color: #3089fc !important; &.btn-disabled { background: #2b3148; } } +.delete-button:hover { + background-color: #2b3148 !important; +} .tableWrapper { display: flex; diff --git a/ui/src/app/pages/datasets/policies.agent/list/agent.policy.list.component.html b/ui/src/app/pages/datasets/policies.agent/list/agent.policy.list.component.html index 18be71817..02330a703 100644 --- a/ui/src/app/pages/datasets/policies.agent/list/agent.policy.list.component.html +++ b/ui/src/app/pages/datasets/policies.agent/list/agent.policy.list.component.html @@ -29,7 +29,7 @@

All Policies

- Last Update: {{ lastUpdate | date: 'HH:mm:ss a' }} - - - - +
+ + + + +
diff --git a/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.ts b/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.ts index 0ec682f6e..74c639ad8 100644 --- a/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.ts +++ b/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.ts @@ -29,6 +29,7 @@ import { filter } from 'rxjs/operators'; import { PolicyDuplicateComponent } from '../duplicate/agent.policy.duplicate.confirmation'; import { NbDialogService } from '@nebular/theme'; import { updateMenuItems } from 'app/pages/pages-menu'; +import { AgentPolicyDeleteComponent } from '../delete/agent.policy.delete.component'; @Component({ selector: 'ngx-agent-view', @@ -217,4 +218,27 @@ export class AgentPolicyViewComponent implements OnInit, OnDestroy, OnChanges { ngOnDestroy() { this.policySubscription?.unsubscribe(); } + openDeleteModal() { + const { name: name, id } = this.policy as AgentPolicy; + this.dialogService + .open(AgentPolicyDeleteComponent, { + context: { name }, + autoFocus: true, + closeOnEsc: true, + }) + .onClose.subscribe((confirm) => { + if (confirm) { + this.policiesService.deleteAgentPolicy(id).subscribe(() => { + this.notifications.success( + 'Agent Policy successfully deleted', + '', + ); + this.goBack(); + }); + } + }); + } + goBack() { + this.router.navigateByUrl('/pages/datasets/policies'); + } } diff --git a/ui/src/app/pages/fleet/agents/list/agent.list.component.html b/ui/src/app/pages/fleet/agents/list/agent.list.component.html index 31358a5dc..cd0813f4a 100644 --- a/ui/src/app/pages/fleet/agents/list/agent.list.component.html +++ b/ui/src/app/pages/fleet/agents/list/agent.list.component.html @@ -38,7 +38,7 @@

All Agents

-
+
@@ -13,6 +13,12 @@ Last Update: {{ lastUpdate | date: 'HH:mm:ss a' }}
+
+ +
diff --git a/ui/src/app/pages/fleet/agents/view/agent.view.component.ts b/ui/src/app/pages/fleet/agents/view/agent.view.component.ts index 3ce6556de..647e561f6 100644 --- a/ui/src/app/pages/fleet/agents/view/agent.view.component.ts +++ b/ui/src/app/pages/fleet/agents/view/agent.view.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { AgentGroup } from 'app/common/interfaces/orb/agent.group.interface'; import { Agent, AgentStates } from 'app/common/interfaces/orb/agent.interface'; import { Dataset } from 'app/common/interfaces/orb/dataset.policy.interface'; @@ -9,6 +9,9 @@ import { STRINGS } from 'assets/text/strings'; import { Observable, Subscription } from 'rxjs'; import { shareReplay } from 'rxjs/operators'; import { updateMenuItems } from 'app/pages/pages-menu'; +import { NotificationsService } from 'app/common/services/notifications/notifications.service'; +import { NbDialogService } from '@nebular/theme'; +import { AgentDeleteComponent } from '../delete/agent.delete.component'; @Component({ selector: 'ngx-agent-view', @@ -40,6 +43,9 @@ export class AgentViewComponent implements OnInit, OnDestroy { protected route: ActivatedRoute, protected orb: OrbService, protected cdr: ChangeDetectorRef, + protected notificationService: NotificationsService, + private dialogService: NbDialogService, + private router: Router, ) { this.agent = {}; this.datasets = {}; @@ -94,4 +100,24 @@ export class AgentViewComponent implements OnInit, OnDestroy { this.refreshAgent(); } } + openDeleteModal() { + const { name, id } = this.agent; + this.dialogService + .open(AgentDeleteComponent, { + context: { name }, + autoFocus: true, + closeOnEsc: true, + }) + .onClose.subscribe((confirm) => { + if (confirm) { + this.agentsService.deleteAgent(id).subscribe(() => { + this.notificationService.success('Agent successfully deleted', ''); + this.goBack(); + }); + } + }); + } + goBack() { + this.router.navigateByUrl('/pages/fleet/agents'); + } } diff --git a/ui/src/app/pages/fleet/groups/list/agent.group.list.component.html b/ui/src/app/pages/fleet/groups/list/agent.group.list.component.html index c5e1d354c..aebda5afe 100644 --- a/ui/src/app/pages/fleet/groups/list/agent.group.list.component.html +++ b/ui/src/app/pages/fleet/groups/list/agent.group.list.component.html @@ -29,7 +29,7 @@

{{ strings.list.header }}

diff --git a/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.scss b/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.scss index c98f332c2..5b32ae03a 100644 --- a/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.scss +++ b/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.scss @@ -123,19 +123,21 @@ nb-form-field { } .agent-save { float: right; - color: #fff !important; + color: #3089fc !important; font-family: 'Montserrat', sans-serif; font-weight: 700; text-transform: none !important; - margin-left: 5px; &.btn-disabled { background: #2b3148; } &:not(.btn-disabled) { - background-color: #3089fc !important; + background-color: transparent !important; } } +.agent-save:hover { + background-color: #171c30 !important; +} .agent-reset { float: right; color: #fff !important; diff --git a/ui/src/app/shared/components/orb/policy/policy-details/policy-details.component.html b/ui/src/app/shared/components/orb/policy/policy-details/policy-details.component.html index 65b203ff9..1d40d5b0b 100644 --- a/ui/src/app/shared/components/orb/policy/policy-details/policy-details.component.html +++ b/ui/src/app/shared/components/orb/policy/policy-details/policy-details.component.html @@ -7,6 +7,7 @@ nbButton shape="round" status="primary"> + Edit diff --git a/ui/src/app/shared/components/orb/policy/policy-interface/policy-interface.component.html b/ui/src/app/shared/components/orb/policy/policy-interface/policy-interface.component.html index 326951e02..f66dd5180 100644 --- a/ui/src/app/shared/components/orb/policy/policy-interface/policy-interface.component.html +++ b/ui/src/app/shared/components/orb/policy/policy-interface/policy-interface.component.html @@ -6,6 +6,7 @@ class="card-button" nbButton status="primary"> + Edit diff --git a/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.html b/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.html index e2117965f..f700ca43c 100644 --- a/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.html +++ b/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.html @@ -7,6 +7,7 @@ class="card-button" nbButton status="primary"> + Edit diff --git a/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.ts b/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.ts index 3c39fd0f6..948dc930f 100644 --- a/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.ts +++ b/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.ts @@ -4,7 +4,6 @@ import { Sink, SinkBackends, SinkStates } from 'app/common/interfaces/orb/sink.i import { SinkFeature } from 'app/common/interfaces/orb/sink/sink.feature.interface'; import { Tags } from 'app/common/interfaces/orb/tag'; import { SinksService } from 'app/common/services/sinks/sinks.service'; -import { SinkConfigComponent } from '../sink-config/sink-config.component'; @Component({ From 6380135b8b1533ced455f1d15200d83b32f7eddb Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Tue, 22 Aug 2023 17:12:53 -0300 Subject: [PATCH 45/83] improvement(orb-ui): #1064 Sink View header (#2580) --- ui/src/app/@theme/styles/_overrides.scss | 37 +++++++++ .../pages/sinks/view/sink.view.component.html | 83 ++++++++++++------- .../pages/sinks/view/sink.view.component.scss | 37 +++++++++ .../pages/sinks/view/sink.view.component.ts | 7 +- .../sink-config/sink-config.component.scss | 3 - .../sink-details/sink-details.component.scss | 2 +- 6 files changed, 132 insertions(+), 37 deletions(-) diff --git a/ui/src/app/@theme/styles/_overrides.scss b/ui/src/app/@theme/styles/_overrides.scss index fcbd2ac44..6212a8c21 100644 --- a/ui/src/app/@theme/styles/_overrides.scss +++ b/ui/src/app/@theme/styles/_overrides.scss @@ -220,3 +220,40 @@ color: #df316f; padding-left: 2px; } +.refresh-button { + border: none !important; + box-sizing: border-box; + box-shadow: none !important; + margin-right: 0.3rem; + + &:active, &:focus { + background-color: unset !important; + } + + &:hover { + background-color: rgba(143, 155, 179, 0.16); + } +} + +.paused { + animation: rotation 750ms linear infinite; + animation-play-state: paused; +} + +.rotate { + animation: rotation 750ms linear infinite; + animation-play-state: running; + + &:hover { + background: unset !important; + } +} + +@keyframes rotation { + from { + transform: rotate(0deg); + } + to { + transform: rotate(359deg); + } +} diff --git a/ui/src/app/pages/sinks/view/sink.view.component.html b/ui/src/app/pages/sinks/view/sink.view.component.html index 97b874f83..d77532717 100644 --- a/ui/src/app/pages/sinks/view/sink.view.component.html +++ b/ui/src/app/pages/sinks/view/sink.view.component.html @@ -1,5 +1,5 @@ -
-
+
+

{{ strings.sink.view.header }}

-
-
- - + + Last Update: {{ lastUpdate | date: 'HH:mm:ss a' }} + +
+
+ + + - + *ngIf="isEditMode()" + > + Discard + +
+
+
+ + + {{ sink?.state | ngxCapitalize }} + +
+
+ + Created on {{ sink?.ts_created | date: 'M/d/yy, HH:mm z' }} +
-
+
diff --git a/ui/src/app/pages/sinks/view/sink.view.component.scss b/ui/src/app/pages/sinks/view/sink.view.component.scss index bb3593d22..db71f6c5d 100644 --- a/ui/src/app/pages/sinks/view/sink.view.component.scss +++ b/ui/src/app/pages/sinks/view/sink.view.component.scss @@ -75,9 +75,19 @@ ngx-sink-config { } header { + display: flex; justify-content: space-between; + align-items: center; +} + +.left-content { + flex: 1; } +.right-content { + display: flex; + align-items: center; +} h4 { font-family: 'Montserrat', sans-serif; font-size: 1.5rem; @@ -113,3 +123,30 @@ h4 { } } } +.fa.fa-circle { + font-size: 11px; +} +.state { + font-size: 16px; + font-weight: 700; +} +.orb-service- { + &active { + color: #6fcf97; + } + &unknown { + color: #9b51e0; + } + &error { + color: #df316f; + } + &idle { + color: #f2994a; + } +} + +.last-update { + color: #969fb9; + font-size: 14px; +} + diff --git a/ui/src/app/pages/sinks/view/sink.view.component.ts b/ui/src/app/pages/sinks/view/sink.view.component.ts index fe3fcd96a..592e07937 100644 --- a/ui/src/app/pages/sinks/view/sink.view.component.ts +++ b/ui/src/app/pages/sinks/view/sink.view.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectorRef, Component, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { Sink } from 'app/common/interfaces/orb/sink.interface'; +import { Sink, SinkStates } from 'app/common/interfaces/orb/sink.interface'; import { NotificationsService } from 'app/common/services/notifications/notifications.service'; import { SinksService } from 'app/common/services/sinks/sinks.service'; import { SinkConfigComponent } from 'app/shared/components/orb/sink/sink-config/sink-config.component'; @@ -29,6 +29,10 @@ export class SinkViewComponent implements OnInit, OnChanges, OnDestroy { sinkSubscription: Subscription; + lastUpdate: Date | null = null; + + sinkStates = SinkStates; + editMode = { details: false, config: false, @@ -147,6 +151,7 @@ export class SinkViewComponent implements OnInit, OnChanges, OnDestroy { this.sink = sink; this.isLoading = false; this.cdr.markForCheck(); + this.lastUpdate = new Date(); }); } diff --git a/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.scss b/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.scss index 20c170ddf..2053aee01 100644 --- a/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.scss +++ b/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.scss @@ -4,9 +4,6 @@ ngx-monaco-editor { .summary-accent { color: #969fb9 !important; } -nb-card { - min-width: 500px; -} .switch-button { color: #3089fc; diff --git a/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.scss b/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.scss index 32d1dae22..f35c9e687 100644 --- a/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.scss +++ b/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.scss @@ -32,4 +32,4 @@ input { } nb-card { min-width: 368px; -} \ No newline at end of file +} From 4498e4032db3164826c1a412ef1242298af73df8 Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Wed, 23 Aug 2023 17:34:00 -0300 Subject: [PATCH 46/83] fix(orb-ui): #1070 disable PUT button to unchanged elements, and block multiple requests (#2581) --- .../dataset-from/dataset-from.component.html | 2 +- .../dataset-from/dataset-from.component.ts | 4 +++ .../add/agent.policy.add.component.html | 2 +- .../add/agent.policy.add.component.ts | 4 +++ .../view/agent.policy.view.component.html | 2 +- .../view/agent.policy.view.component.ts | 25 ++++++++++++++++++- .../fleet/agents/add/agent.add.component.html | 3 ++- .../fleet/agents/add/agent.add.component.ts | 4 +++ .../agents/list/agent.list.component.html | 2 +- .../fleet/agents/list/agent.list.component.ts | 20 --------------- .../groups/add/agent.group.add.component.html | 3 ++- .../groups/add/agent.group.add.component.ts | 4 +++ .../pages/sinks/add/sink-add.component.html | 2 +- .../app/pages/sinks/add/sink-add.component.ts | 4 +++ .../pages/sinks/view/sink.view.component.html | 2 +- .../pages/sinks/view/sink.view.component.ts | 19 +++++++++++++- .../agent-information.component.html | 3 ++- .../agent-information.component.scss | 7 ++---- .../agent-information.component.ts | 16 ++++++++++++ 19 files changed, 92 insertions(+), 36 deletions(-) diff --git a/ui/src/app/pages/datasets/dataset-from/dataset-from.component.html b/ui/src/app/pages/datasets/dataset-from/dataset-from.component.html index 44c00703e..a2a370d44 100644 --- a/ui/src/app/pages/datasets/dataset-from/dataset-from.component.html +++ b/ui/src/app/pages/datasets/dataset-from/dataset-from.component.html @@ -129,7 +129,7 @@ - diff --git a/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.ts b/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.ts index 74c639ad8..a6d9de9e0 100644 --- a/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.ts +++ b/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.ts @@ -55,6 +55,8 @@ export class AgentPolicyViewComponent implements OnInit, OnDestroy, OnChanges { interface: false, }; + isRequesting: boolean; + lastUpdate: Date | null = null; @ViewChild(PolicyDetailsComponent) detailsComponent: PolicyDetailsComponent; @@ -71,7 +73,9 @@ export class AgentPolicyViewComponent implements OnInit, OnDestroy, OnChanges { private router: Router, private dialogService: NbDialogService, private editor: CodeEditorService, - ) {} + ) { + this.isRequesting = false; + } ngOnInit() { this.fetchData(); @@ -123,6 +127,8 @@ export class AgentPolicyViewComponent implements OnInit, OnDestroy, OnChanges { } save() { + this.isRequesting = true; + const { format, version, name, description, id, backend } = this.policy; // get values from all modified sections' forms and submit through service. @@ -165,6 +171,7 @@ export class AgentPolicyViewComponent implements OnInit, OnDestroy, OnChanges { this.discard(); this.policy = resp; this.fetchData(); + this.isRequesting = false; }); } catch (err) { @@ -241,4 +248,20 @@ export class AgentPolicyViewComponent implements OnInit, OnDestroy, OnChanges { goBack() { this.router.navigateByUrl('/pages/datasets/policies'); } + + hasChanges() { + let policyDetails = this.detailsComponent.formGroup?.value; + const tags = this.detailsComponent.selectedTags; + + const description = this.policy.description ? this.policy.description : ""; + const formsDescription = policyDetails.description === null ? "" : policyDetails.description + + let selectedTags = JSON.stringify(tags); + let orb_tags = JSON.stringify(this.policy.tags); + + if (policyDetails.name !== this.policy.name || formsDescription !== description || selectedTags !== orb_tags) { + return true; + } + return false; + } } diff --git a/ui/src/app/pages/fleet/agents/add/agent.add.component.html b/ui/src/app/pages/fleet/agents/add/agent.add.component.html index 717514493..c8bdea7fe 100644 --- a/ui/src/app/pages/fleet/agents/add/agent.add.component.html +++ b/ui/src/app/pages/fleet/agents/add/agent.add.component.html @@ -148,7 +148,8 @@

{{isEdit ? 'Edit Agent' : 'New Agent'}}

nbButton shape="round" status="primary" - type="submit"> + type="submit" + [disabled]="isRequesting"> {{ strings.stepper.save }} diff --git a/ui/src/app/pages/sinks/add/sink-add.component.ts b/ui/src/app/pages/sinks/add/sink-add.component.ts index 1a45b624a..45a8ead89 100644 --- a/ui/src/app/pages/sinks/add/sink-add.component.ts +++ b/ui/src/app/pages/sinks/add/sink-add.component.ts @@ -27,6 +27,8 @@ export class SinkAddComponent { sinkBackend: any; + isRequesting: boolean; + constructor( private sinksService: SinksService, private notificationsService: NotificationsService, @@ -34,6 +36,7 @@ export class SinkAddComponent { private editor: CodeEditorService, ) { this.createMode = true; + this.isRequesting = false; } canCreate() { @@ -56,6 +59,7 @@ export class SinkAddComponent { } createSink() { + this.isRequesting = true; const sinkDetails = this.detailsComponent.formGroup?.value; const tags = this.detailsComponent.selectedTags; const configSink = this.configComponent.code; diff --git a/ui/src/app/pages/sinks/view/sink.view.component.html b/ui/src/app/pages/sinks/view/sink.view.component.html index d77532717..57042195c 100644 --- a/ui/src/app/pages/sinks/view/sink.view.component.html +++ b/ui/src/app/pages/sinks/view/sink.view.component.html @@ -31,7 +31,7 @@

{{ strings.sink.view.header }}

diff --git a/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.scss b/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.scss index 5b32ae03a..2c99c07ca 100644 --- a/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.scss +++ b/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.scss @@ -127,12 +127,9 @@ nb-form-field { font-family: 'Montserrat', sans-serif; font-weight: 700; text-transform: none !important; + background-color: transparent !important; &.btn-disabled { - background: #2b3148; - } - - &:not(.btn-disabled) { - background-color: transparent !important; + color: #8c93b1 !important; } } .agent-save:hover { diff --git a/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.ts b/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.ts index 7cf53f43c..525621227 100644 --- a/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.ts +++ b/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.ts @@ -23,6 +23,8 @@ export class AgentInformationComponent implements OnInit { selectedTags: Tags; + isRequesting: boolean; + @Output() refreshRequests = new EventEmitter(); @@ -32,6 +34,7 @@ export class AgentInformationComponent implements OnInit { private fb: FormBuilder, ) { this.isResetting = false; + this.isRequesting = false; this.editMode = false; this.updateForm(); } @@ -100,6 +103,7 @@ export class AgentInformationComponent implements OnInit { return false; } save () { + this.isRequesting = true; const name = this.formGroup.controls.name.value; const payload = { name: name, @@ -109,7 +113,19 @@ export class AgentInformationComponent implements OnInit { this.notificationService.success('Agent successfully updated', ''); this.refreshRequests.emit(true); this.editMode = false; + this.isRequesting = false; }); + } + + hasChanges() { + const name = this.formGroup.controls.name.value; + let selectedTags = JSON.stringify(this.selectedTags); + let orb_tags = JSON.stringify(this.agent.orb_tags); + + if (this.agent.name !== name || selectedTags !== orb_tags) { + return true; + } + return false; } } From 0fd39a57327339c53150996a3fcc5073f857e0e8 Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Wed, 23 Aug 2023 18:09:21 -0300 Subject: [PATCH 47/83] improvement(orb-ui): #1079 add 100% grid and styles on sink view components (#2582) --- .../pages/sinks/view/sink.view.component.html | 2 +- .../pages/sinks/view/sink.view.component.scss | 27 ------------------- .../sink-config/sink-config.component.scss | 24 +++++++++++++++++ .../sink-details/sink-details.component.scss | 24 +++++++++++++++-- 4 files changed, 47 insertions(+), 30 deletions(-) diff --git a/ui/src/app/pages/sinks/view/sink.view.component.html b/ui/src/app/pages/sinks/view/sink.view.component.html index 57042195c..cd0590ec3 100644 --- a/ui/src/app/pages/sinks/view/sink.view.component.html +++ b/ui/src/app/pages/sinks/view/sink.view.component.html @@ -71,7 +71,7 @@

{{ strings.sink.view.header }}

-
+
diff --git a/ui/src/app/pages/sinks/view/sink.view.component.scss b/ui/src/app/pages/sinks/view/sink.view.component.scss index db71f6c5d..c4a64214a 100644 --- a/ui/src/app/pages/sinks/view/sink.view.component.scss +++ b/ui/src/app/pages/sinks/view/sink.view.component.scss @@ -47,33 +47,6 @@ button { } } -ngx-sink-details { - flex: 0 1 22rem; -} - -ngx-sink-config { - flex: 2 1 auto; - min-height: 30rem !important; - - nb-card { - height: 30rem !important; - } -} -.row { - display: flex; - gap: 10px; -} - -.card-col { - flex-grow: 1; -} - -@media (min-width: 768px) { - .card-col { - min-width: 370px !important; - } -} - header { display: flex; justify-content: space-between; diff --git a/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.scss b/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.scss index 2053aee01..cdd48cfd7 100644 --- a/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.scss +++ b/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.scss @@ -26,3 +26,27 @@ ngx-monaco-editor { .align-items { margin-left: auto; } +nb-card { + margin: 15px 0 !important; + padding: 0 !important; + border: transparent; + border-radius: 0.5rem; + + nb-card-header { + background-color: #232940; + border-bottom: transparent; + border-radius: 0.5rem; + color: #969fb9; + padding: 0.5rem 1rem; + } + + nb-card-body { + label { + color: #969fb9; + } + + span { + text-align: end; + } + } + } diff --git a/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.scss b/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.scss index f35c9e687..4cc2a27c4 100644 --- a/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.scss +++ b/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.scss @@ -31,5 +31,25 @@ input { color: #df316f; } nb-card { - min-width: 368px; -} + margin: 15px 0 !important; + padding: 0 !important; + border: transparent; + border-radius: 0.5rem; + + nb-card-header { + background-color: #232940; + border-bottom: transparent; + border-radius: 0.5rem; + color: #969fb9; + padding: 0.5rem 1rem; + } + nb-card-body { + label { + color: #969fb9; + } + + span { + text-align: end; + } + } +} \ No newline at end of file From c2eceaf3801685d7e52ee7e0b5c36260bd570c0b Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Fri, 25 Aug 2023 16:12:49 -0300 Subject: [PATCH 48/83] emprovement(orb-ui): #1078 ux/ui tag control component (#2583) --- .../orb/tag-control/tag-control.component.html | 6 +++--- .../orb/tag-control/tag-control.component.scss | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/ui/src/app/shared/components/orb/tag-control/tag-control.component.html b/ui/src/app/shared/components/orb/tag-control/tag-control.component.html index ee6cabad4..28852fc63 100644 --- a/ui/src/app/shared/components/orb/tag-control/tag-control.component.html +++ b/ui/src/app/shared/components/orb/tag-control/tag-control.component.html @@ -25,7 +25,7 @@
-
+
@@ -48,7 +48,7 @@
- + :
@@ -74,7 +74,7 @@
diff --git a/ui/src/app/pages/datasets/policies.agent/list/agent.policy.list.component.scss b/ui/src/app/pages/datasets/policies.agent/list/agent.policy.list.component.scss index 6624eb7da..289605f05 100644 --- a/ui/src/app/pages/datasets/policies.agent/list/agent.policy.list.component.scss +++ b/ui/src/app/pages/datasets/policies.agent/list/agent.policy.list.component.scss @@ -219,14 +219,6 @@ mat-chip-list { align-items: center; gap: 10px; } -.delete-selected { - color: #ffffff !important; - font-family: 'Montserrat', sans-serif; - font-weight: 600; - text-transform: none !important; - width: 90px; - background-color: #df316f !important; -} input[type=checkbox] { margin-left: 10px; } \ No newline at end of file diff --git a/ui/src/app/pages/fleet/agents/delete/agent.delete.component.scss b/ui/src/app/pages/fleet/agents/delete/agent.delete.component.scss index 3f3548d1f..8ac634efb 100644 --- a/ui/src/app/pages/fleet/agents/delete/agent.delete.component.scss +++ b/ui/src/app/pages/fleet/agents/delete/agent.delete.component.scss @@ -1,43 +1,43 @@ nb-card { - max-width: 38rem; - + max-width: 38rem !important; + nb-card-header { - background: #232940; - color: #969fb9; + background: #232940 !important; + color: #969fb9 !important; } - + nb-card-body { - margin: 2rem 3rem; - padding: 0; - + margin: 2rem 3rem !important; + padding: 0 !important; + p { - color: #969fb9; + color: #969fb9 !important; } - + .ns1-red { - color: #df316f; + color: #df316f !important; } } - + nb-card-footer { - text-align: center; - padding: 1.5rem; + text-align: center !important; + padding: 1.5rem !important; } } // ORB ::ng-deep { .orb-close-dialog { - background-color: #23294000; - border-radius: 4px; - display: contents; - float: right; + background-color: #23294000 !important; + border-radius: 4px !important; + display: contents !important; + float: right !important; > span { - float: right; - font-size: 1.5rem; - color: #3089fc; - font-weight: 900; + float: right !important; + font-size: 1.5rem !important; + color: #3089fc !important; + font-weight: 900 !important; } } diff --git a/ui/src/app/pages/fleet/agents/list/agent.list.component.html b/ui/src/app/pages/fleet/agents/list/agent.list.component.html index 3c81c0f09..adf5a4a5d 100644 --- a/ui/src/app/pages/fleet/agents/list/agent.list.component.html +++ b/ui/src/app/pages/fleet/agents/list/agent.list.component.html @@ -22,6 +22,7 @@

All Agents

class="delete-selected" nbButton shape="round"> + Delete
diff --git a/ui/src/app/pages/fleet/agents/list/agent.list.component.scss b/ui/src/app/pages/fleet/agents/list/agent.list.component.scss index ed9f51ff2..b3d73df0f 100644 --- a/ui/src/app/pages/fleet/agents/list/agent.list.component.scss +++ b/ui/src/app/pages/fleet/agents/list/agent.list.component.scss @@ -186,7 +186,7 @@ input[type=checkbox] { font-family: 'Montserrat', sans-serif; font-weight: 600; text-transform: none !important; - width: 125px; + width: 160px; &.btn-disabled { background: #2b3148; @@ -202,11 +202,3 @@ input[type=checkbox] { align-items: center; gap: 10px; } -.delete-selected { - color: #ffffff !important; - font-family: 'Montserrat', sans-serif; - font-weight: 600; - text-transform: none !important; - width: 90px; - background-color: #df316f !important; -} \ No newline at end of file diff --git a/ui/src/app/pages/fleet/groups/delete/agent.group.delete.component.scss b/ui/src/app/pages/fleet/groups/delete/agent.group.delete.component.scss index 3f3548d1f..8ac634efb 100644 --- a/ui/src/app/pages/fleet/groups/delete/agent.group.delete.component.scss +++ b/ui/src/app/pages/fleet/groups/delete/agent.group.delete.component.scss @@ -1,43 +1,43 @@ nb-card { - max-width: 38rem; - + max-width: 38rem !important; + nb-card-header { - background: #232940; - color: #969fb9; + background: #232940 !important; + color: #969fb9 !important; } - + nb-card-body { - margin: 2rem 3rem; - padding: 0; - + margin: 2rem 3rem !important; + padding: 0 !important; + p { - color: #969fb9; + color: #969fb9 !important; } - + .ns1-red { - color: #df316f; + color: #df316f !important; } } - + nb-card-footer { - text-align: center; - padding: 1.5rem; + text-align: center !important; + padding: 1.5rem !important; } } // ORB ::ng-deep { .orb-close-dialog { - background-color: #23294000; - border-radius: 4px; - display: contents; - float: right; + background-color: #23294000 !important; + border-radius: 4px !important; + display: contents !important; + float: right !important; > span { - float: right; - font-size: 1.5rem; - color: #3089fc; - font-weight: 900; + float: right !important; + font-size: 1.5rem !important; + color: #3089fc !important; + font-weight: 900 !important; } } diff --git a/ui/src/app/pages/fleet/groups/list/agent.group.list.component.html b/ui/src/app/pages/fleet/groups/list/agent.group.list.component.html index aebda5afe..d9a35c5c2 100644 --- a/ui/src/app/pages/fleet/groups/list/agent.group.list.component.html +++ b/ui/src/app/pages/fleet/groups/list/agent.group.list.component.html @@ -23,6 +23,7 @@

{{ strings.list.header }}

class="delete-selected" nbButton shape="round"> + Delete
diff --git a/ui/src/app/pages/fleet/groups/list/agent.group.list.component.scss b/ui/src/app/pages/fleet/groups/list/agent.group.list.component.scss index c65dc661e..bf19677d6 100644 --- a/ui/src/app/pages/fleet/groups/list/agent.group.list.component.scss +++ b/ui/src/app/pages/fleet/groups/list/agent.group.list.component.scss @@ -187,14 +187,6 @@ mat-chip-list { align-items: center; gap: 10px; } -.delete-selected { - color: #ffffff !important; - font-family: 'Montserrat', sans-serif; - font-weight: 600; - text-transform: none !important; - width: 90px; - background-color: #df316f !important; -} input[type=checkbox] { margin-left: 10px; } \ No newline at end of file diff --git a/ui/src/app/pages/sinks/delete/sink.delete.component.scss b/ui/src/app/pages/sinks/delete/sink.delete.component.scss index 3f3548d1f..8ac634efb 100644 --- a/ui/src/app/pages/sinks/delete/sink.delete.component.scss +++ b/ui/src/app/pages/sinks/delete/sink.delete.component.scss @@ -1,43 +1,43 @@ nb-card { - max-width: 38rem; - + max-width: 38rem !important; + nb-card-header { - background: #232940; - color: #969fb9; + background: #232940 !important; + color: #969fb9 !important; } - + nb-card-body { - margin: 2rem 3rem; - padding: 0; - + margin: 2rem 3rem !important; + padding: 0 !important; + p { - color: #969fb9; + color: #969fb9 !important; } - + .ns1-red { - color: #df316f; + color: #df316f !important; } } - + nb-card-footer { - text-align: center; - padding: 1.5rem; + text-align: center !important; + padding: 1.5rem !important; } } // ORB ::ng-deep { .orb-close-dialog { - background-color: #23294000; - border-radius: 4px; - display: contents; - float: right; + background-color: #23294000 !important; + border-radius: 4px !important; + display: contents !important; + float: right !important; > span { - float: right; - font-size: 1.5rem; - color: #3089fc; - font-weight: 900; + float: right !important; + font-size: 1.5rem !important; + color: #3089fc !important; + font-weight: 900 !important; } } diff --git a/ui/src/app/pages/sinks/list/sink.list.component.html b/ui/src/app/pages/sinks/list/sink.list.component.html index bb2d1b42f..2a54e91db 100644 --- a/ui/src/app/pages/sinks/list/sink.list.component.html +++ b/ui/src/app/pages/sinks/list/sink.list.component.html @@ -23,6 +23,7 @@

{{ strings.list.header }}

class="delete-selected" nbButton shape="round"> + Delete
diff --git a/ui/src/app/pages/sinks/list/sink.list.component.scss b/ui/src/app/pages/sinks/list/sink.list.component.scss index 1a4131acc..25a0c8de2 100644 --- a/ui/src/app/pages/sinks/list/sink.list.component.scss +++ b/ui/src/app/pages/sinks/list/sink.list.component.scss @@ -208,14 +208,6 @@ mat-chip-list { align-items: center; gap: 10px; } -.delete-selected { - color: #ffffff !important; - font-family: 'Montserrat', sans-serif; - font-weight: 600; - text-transform: none !important; - width: 90px; - background-color: #df316f !important; -} input[type=checkbox] { margin-left: 10px; } diff --git a/ui/src/app/shared/components/delete/delete.selected.component.html b/ui/src/app/shared/components/delete/delete.selected.component.html index 61300a02a..a068e1781 100644 --- a/ui/src/app/shared/components/delete/delete.selected.component.html +++ b/ui/src/app/shared/components/delete/delete.selected.component.html @@ -14,7 +14,7 @@
{{ item.name }} {{ item.state | titlecase }} {{ item.usage | titlecase }}
-

*To confirm, type the amount of {{ elementName }} to be delete.

+

*To confirm, type the amount of {{ elementName }} to be delete.

Date: Fri, 25 Aug 2023 16:56:29 -0300 Subject: [PATCH 50/83] feat(orb-ui): #30 include file config command on agent credentials window (#2585) --- .../fleet/agents/key/agent.key.component.html | 115 +++++++++++++----- .../fleet/agents/key/agent.key.component.scss | 20 ++- .../fleet/agents/key/agent.key.component.ts | 66 ++++++++-- 3 files changed, 152 insertions(+), 49 deletions(-) diff --git a/ui/src/app/pages/fleet/agents/key/agent.key.component.html b/ui/src/app/pages/fleet/agents/key/agent.key.component.html index 77ce461dd..406545aff 100644 --- a/ui/src/app/pages/fleet/agents/key/agent.key.component.html +++ b/ui/src/app/pages/fleet/agents/key/agent.key.component.html @@ -12,43 +12,94 @@ -

Make sure to copy the Agent Key now. You won’t be able to see it again!

- - - 
-      
-      {{ agent?.key }}
-
- - -

+

+ *Make sure to copy the Agent Key now. You won’t be able to see it again! +

+ + Agent Key + + 
+          
+          {{ agent?.key }}
+
+ + +

See here + target="_blank">See here - for more advanced options. -

- 
-      
-      
+          
+          
+            {{ defaultCommandShow }}
+          
+
+ + + + + Provisioning Command with Configuration File + - - {{ command2show }} - - + + + 
+          
+          
+          
+            {{ fileConfigCommandShow }}
+          
+
+ + diff --git a/ui/src/app/pages/fleet/agents/key/agent.key.component.scss b/ui/src/app/pages/fleet/agents/key/agent.key.component.scss index fea7f7f75..c11ef7c7a 100644 --- a/ui/src/app/pages/fleet/agents/key/agent.key.component.scss +++ b/ui/src/app/pages/fleet/agents/key/agent.key.component.scss @@ -1,13 +1,23 @@ nb-card { - max-width: 50rem; - + max-width: 60rem; + max-height: 700px; + min-width: 700px; + nb-card-header { - background: #232940; + background-color: #232940; + border-bottom: transparent; + border-radius: 0.5rem; color: #969fb9; + padding: 0.5rem 1rem; + button { + float: right; + } } nb-card-body { - margin: 2rem 3rem; + border-bottom-left-radius: 0.5rem; + border-bottom-right-radius: 0.5rem; + margin: 0 2rem 2rem 2rem; padding: 0; p { @@ -26,7 +36,7 @@ nb-card { align-items: flex-start; justify-content: space-between; - background: #1c2339; + background: transparent; padding: 0.75rem; border-radius: 0.5rem; white-space: pre-line; diff --git a/ui/src/app/pages/fleet/agents/key/agent.key.component.ts b/ui/src/app/pages/fleet/agents/key/agent.key.component.ts index 0715c0ecd..5310006dd 100644 --- a/ui/src/app/pages/fleet/agents/key/agent.key.component.ts +++ b/ui/src/app/pages/fleet/agents/key/agent.key.component.ts @@ -12,14 +12,18 @@ import { Agent } from 'app/common/interfaces/orb/agent.interface'; export class AgentKeyComponent implements OnInit { strings = STRINGS.agents; - command2copy: string; + defaultCommandCopy: string; + defaultCommandShow: string; + fileConfigCommandCopy: string; + fileConfigCommandShow: string; - command2show: string; copyCommandIcon: string; key2copy: string; copyKeyIcon: string; saveKeyIcon: string; + hideCommand: boolean; + hideCommand2: boolean; @Input() agent: Agent = {}; @@ -28,6 +32,8 @@ export class AgentKeyComponent implements OnInit { protected route: ActivatedRoute, protected router: Router, ) { + this.hideCommand = false; + this.hideCommand2 = false; } ngOnInit(): void { @@ -39,7 +45,7 @@ export class AgentKeyComponent implements OnInit { } makeCommand2Copy() { - this.command2copy = `docker run -d --restart=always --net=host \\ + this.defaultCommandCopy = `docker run -d --restart=always --net=host \\ -e ORB_CLOUD_ADDRESS=${ document.location.hostname } \\ -e ORB_CLOUD_MQTT_ID=${ this.agent.id } \\ -e ORB_CLOUD_MQTT_CHANNEL_ID=${ this.agent.channel_id } \\ @@ -47,13 +53,31 @@ export class AgentKeyComponent implements OnInit { -e PKTVISOR_PCAP_IFACE_DEFAULT=auto \\ orbcommunity/orb-agent`; - this.command2show = `docker run -d --restart=always --net=host \\ + this.defaultCommandShow = `docker run -d --restart=always --net=host \\ -e ORB_CLOUD_ADDRESS=${ document.location.hostname } \\ -e ORB_CLOUD_MQTT_ID=${ this.agent.id } \\ -e ORB_CLOUD_MQTT_CHANNEL_ID=${ this.agent.channel_id } \\ -e ORB_CLOUD_MQTT_KEY=${ this.agent.key } \\ -e PKTVISOR_PCAP_IFACE_DEFAULT=auto \\ orbcommunity/orb-agent`; + + this.fileConfigCommandCopy = `docker run -d --restart=always --net=host \\ +-e ORB_CLOUD_ADDRESS=${ document.location.hostname } \\ +-e ORB_CLOUD_MQTT_ID=${ this.agent.id } \\ +-e ORB_CLOUD_MQTT_CHANNEL_ID=${ this.agent.channel_id } \\ +-e ORB_CLOUD_MQTT_KEY=${ this.agent.key } \\ +-e PKTVISOR_PCAP_IFACE_DEFAULT=auto \\ +-v \${PWD}/:/usr/local/orb/ \\ +orbcommunity/orb-agent run -c /usr/local/orb/agent.yaml`; + + this.fileConfigCommandShow = `docker run -d --restart=always --net=host \\ +-e ORB_CLOUD_ADDRESS=${ document.location.hostname } \\ +-e ORB_CLOUD_MQTT_ID=${ this.agent.id } \\ +-e ORB_CLOUD_MQTT_CHANNEL_ID=${ this.agent.channel_id } \\ +-e ORB_CLOUD_MQTT_KEY=${ this.agent.key } \\ +-e PKTVISOR_PCAP_IFACE_DEFAULT=auto \\ +-v \${PWD}/:/usr/local/orb/ \\ +orbcommunity/orb-agent run -c /usr/local/orb/agent.yaml`; } toggleIcon (target) { @@ -73,13 +97,31 @@ orbcommunity/orb-agent`; onClose() { this.dialogRef.close(false); } - downloadCommand() { - const blob = new Blob([this.command2copy], { type: 'text/plain' }); - const url = window.URL.createObjectURL(blob); - const a = document.createElement('a'); - a.href = url; - a.download = `${this.agent.id}.txt`; - a.click(); - window.URL.revokeObjectURL(url); + downloadCommand(commandType: string) { + if (commandType === 'default') { + const blob = new Blob([this.defaultCommandCopy], { type: 'text/plain' }); + const url = window.URL.createObjectURL(blob); + const a = document.createElement('a'); + a.href = url; + a.download = `${this.agent.id}.txt`; + a.click(); + window.URL.revokeObjectURL(url); + } + else if (commandType === 'fileConfig') { + const blob = new Blob([this.fileConfigCommandCopy], { type: 'text/plain' }); + const url = window.URL.createObjectURL(blob); + const a = document.createElement('a'); + a.href = url; + a.download = `${this.agent.id}_configfile.txt`; + a.click(); + window.URL.revokeObjectURL(url); + } + + } + toggleProvisioningCommand() { + this.hideCommand = !this.hideCommand; + } + toggleProvisioningCommand2() { + this.hideCommand2 = !this.hideCommand2; } } From bc28cf9e3f84ddc8c0f8840dad0891019fbeaf76 Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Mon, 28 Aug 2023 15:11:22 -0300 Subject: [PATCH 51/83] improvement(orb-ui): #1088 add 100% grid Add Sink page (#2587) --- .../pages/sinks/add/sink-add.component.html | 10 +++---- .../pages/sinks/add/sink-add.component.scss | 30 ++----------------- 2 files changed, 7 insertions(+), 33 deletions(-) diff --git a/ui/src/app/pages/sinks/add/sink-add.component.html b/ui/src/app/pages/sinks/add/sink-add.component.html index 8c422b97e..8ce2016f7 100644 --- a/ui/src/app/pages/sinks/add/sink-add.component.html +++ b/ui/src/app/pages/sinks/add/sink-add.component.html @@ -12,7 +12,7 @@

{{ strings.sink.add.header }}

-
+
-
+
-
+
- - -
\ No newline at end of file +
diff --git a/ui/src/app/pages/sinks/add/sink-add.component.scss b/ui/src/app/pages/sinks/add/sink-add.component.scss index 197713347..d988b3e98 100644 --- a/ui/src/app/pages/sinks/add/sink-add.component.scss +++ b/ui/src/app/pages/sinks/add/sink-add.component.scss @@ -20,33 +20,9 @@ button { .sink-cancel { background-color: #3089fc !important; } - ngx-sink-details { - flex: 0 1 22rem; - } - - ngx-sink-config { - flex: 2 1 auto; - min-height: 30rem !important; - - nb-card { - height: 30rem !important; - } - } - - .row { - display: flex; - gap: 10px; - } - - .card-col { - flex-grow: 1; - } - - @media (min-width: 768px) { - .card-col { - min-width: 370px !important; - } - } + + + header { From 2574ae3527552bcf7f7b4230ce10dfa954fa35ae Mon Sep 17 00:00:00 2001 From: Guilhermo Pazuch <1490938+gpazuch@users.noreply.github.com> Date: Mon, 28 Aug 2023 15:18:28 -0300 Subject: [PATCH 52/83] fix(eng-13): fix no auth strategy name (#2586) --- ui/src/app/@core/core.module.ts | 4 ++++ .../app/auth/pages/reset-password/reset-password.component.ts | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ui/src/app/@core/core.module.ts b/ui/src/app/@core/core.module.ts index 3d6eefb9b..7ea5a6ce7 100644 --- a/ui/src/app/@core/core.module.ts +++ b/ui/src/app/@core/core.module.ts @@ -47,6 +47,10 @@ export const NB_CORE_PROVIDERS = [ resetPass: { endpoint: environment.resetPassUrl, method: 'put', + redirect: { + success: '/auth/login', + failure: null + } }, logout: { method: null, redirect: { success: '/', failure: '/' } }, diff --git a/ui/src/app/auth/pages/reset-password/reset-password.component.ts b/ui/src/app/auth/pages/reset-password/reset-password.component.ts index a863e4f48..eceecfc57 100644 --- a/ui/src/app/auth/pages/reset-password/reset-password.component.ts +++ b/ui/src/app/auth/pages/reset-password/reset-password.component.ts @@ -22,7 +22,7 @@ export class ResetPasswordComponent extends NbResetPasswordComponent { showMessages: any = {}; - strategy: string = ''; + strategy: string = 'email'; submitted = false; From 8e5a90d71f0ea54d17650d207a987a2dade5494b Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Mon, 28 Aug 2023 15:18:37 -0300 Subject: [PATCH 53/83] fix(orb-ui): #1098 Users can't redo CREATE request after a error (#2588) --- .../datasets/policies.agent/add/agent.policy.add.component.ts | 1 + ui/src/app/pages/fleet/agents/add/agent.add.component.ts | 4 ++++ .../app/pages/fleet/groups/add/agent.group.add.component.ts | 3 +++ ui/src/app/pages/sinks/add/sink-add.component.ts | 3 +++ 4 files changed, 11 insertions(+) diff --git a/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.ts b/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.ts index a0ea52d47..025583845 100644 --- a/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.ts +++ b/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.ts @@ -328,6 +328,7 @@ kind: collection`; 'Failed to create Agent Policy', `Error: ${error.status} - ${error.statusText} - ${error.error.error}`, ); + this.isRequesting = false; }, ); } diff --git a/ui/src/app/pages/fleet/agents/add/agent.add.component.ts b/ui/src/app/pages/fleet/agents/add/agent.add.component.ts index 667977482..7d4d86512 100644 --- a/ui/src/app/pages/fleet/agents/add/agent.add.component.ts +++ b/ui/src/app/pages/fleet/agents/add/agent.add.component.ts @@ -9,6 +9,7 @@ import { NotificationsService } from 'app/common/services/notifications/notifica import { AgentKeyComponent } from '../key/agent.key.component'; import { Tags } from 'app/common/interfaces/orb/tag'; + @Component({ selector: 'ngx-agent-add-component', templateUrl: './agent.add.component.html', @@ -127,6 +128,9 @@ export class AgentAddComponent { } else { this.agentsService.addAgent(payload).subscribe((resp) => { this.openKeyModal(resp); + }, + (error) => { + this.isRequesting = false; }); } } diff --git a/ui/src/app/pages/fleet/groups/add/agent.group.add.component.ts b/ui/src/app/pages/fleet/groups/add/agent.group.add.component.ts index 733543773..60e337cc4 100644 --- a/ui/src/app/pages/fleet/groups/add/agent.group.add.component.ts +++ b/ui/src/app/pages/fleet/groups/add/agent.group.add.component.ts @@ -300,6 +300,9 @@ export class AgentGroupAddComponent '', ); this.goBack(); + }, + (error) => { + this.isRequesting = false; }); } } diff --git a/ui/src/app/pages/sinks/add/sink-add.component.ts b/ui/src/app/pages/sinks/add/sink-add.component.ts index 45a8ead89..d368dd044 100644 --- a/ui/src/app/pages/sinks/add/sink-add.component.ts +++ b/ui/src/app/pages/sinks/add/sink-add.component.ts @@ -88,6 +88,9 @@ export class SinkAddComponent { this.sinksService.addSink(payload).subscribe(() => { this.notificationsService.success('Sink successfully created', ''); this.goBack(); + }, + (error) => { + this.isRequesting = false; }); } From 995fcf2945264d9771e5792d1e5f101037ec900b Mon Sep 17 00:00:00 2001 From: Luiz Pegoraro Date: Mon, 28 Aug 2023 16:38:31 -0300 Subject: [PATCH 54/83] feat(maestro): fix probable nil reference error. --- maestro/redis/consumer/hashset.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maestro/redis/consumer/hashset.go b/maestro/redis/consumer/hashset.go index 3893c7fc4..75b895e84 100644 --- a/maestro/redis/consumer/hashset.go +++ b/maestro/redis/consumer/hashset.go @@ -62,10 +62,10 @@ func (es eventStore) handleSinksCreateCollector(ctx context.Context, event redis SinkID: event.SinkID, OwnerID: event.Owner, }) - if err != nil { + if err != nil || (sinkData != nil && sinkData.Config == nil) { es.logger.Error("could not fetch info for sink", zap.String("sink-id", event.SinkID), zap.Error(err)) + return err } - var metadata types.Metadata if err := json.Unmarshal(sinkData.Config, &metadata); err != nil { return err From 9e5a9d0515c093c2fd7456fa55e4c079da220086 Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Thu, 31 Aug 2023 13:32:21 -0300 Subject: [PATCH 55/83] fix(orb-ui): Improve policy view header positioning (#2597) --- .../view/agent.policy.view.component.html | 55 +++++++++---------- .../view/agent.policy.view.component.scss | 12 +++- 2 files changed, 38 insertions(+), 29 deletions(-) diff --git a/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.html b/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.html index 3fe199805..935162b35 100644 --- a/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.html +++ b/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.html @@ -1,5 +1,5 @@
-
+
Policy View
-
-
- - - Last Update: {{ lastUpdate | date: 'HH:mm:ss a' }} - -
- - - - -
-
+
+ + + Last Update: {{ lastUpdate | date: 'HH:mm:ss a' }} + + +
+ + + +
+
diff --git a/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.scss b/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.scss index 0d9922742..ed8590490 100644 --- a/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.scss +++ b/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.scss @@ -235,7 +235,17 @@ button { color: #969fb9; font-size: 14px; } +header { + display: flex; + justify-content: space-between; + align-items: center; +} + +.left-content { + flex: 1; +} + .right-content { display: flex; - justify-content: flex-end; + align-items: center; } From c258620ae1950661826a115cd65a400167b830d6 Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Thu, 31 Aug 2023 13:32:35 -0300 Subject: [PATCH 56/83] fix(orb-ui): #1096 Update Matching agent styles (#2596) --- ui/src/app/@theme/styles/_overrides.scss | 4 +-- .../agents/match/agent.match.component.html | 29 ++++++++++++------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/ui/src/app/@theme/styles/_overrides.scss b/ui/src/app/@theme/styles/_overrides.scss index 1c0f54936..8d9c57da1 100644 --- a/ui/src/app/@theme/styles/_overrides.scss +++ b/ui/src/app/@theme/styles/_overrides.scss @@ -206,13 +206,13 @@ &online, &healthy { color: #6fcf97; } - &stale, &none { + &stale { color: #f2994a; } &error, &failure { color: #df316f; } - &offline { + &offline, &none { color: #969fb9; } } diff --git a/ui/src/app/pages/fleet/agents/match/agent.match.component.html b/ui/src/app/pages/fleet/agents/match/agent.match.component.html index 9dbd339fa..7e026295f 100644 --- a/ui/src/app/pages/fleet/agents/match/agent.match.component.html +++ b/ui/src/app/pages/fleet/agents/match/agent.match.component.html @@ -50,16 +50,25 @@ -
- - - {{tag | tagchip}} - - -
+ + + {{ tag.key }}:  + {{ tag.value }} + + + No tag were created + + Date: Thu, 31 Aug 2023 13:32:55 -0300 Subject: [PATCH 57/83] fix(orb-ui): #124 center align agent key (#2595) --- ui/src/app/pages/fleet/agents/key/agent.key.component.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/src/app/pages/fleet/agents/key/agent.key.component.scss b/ui/src/app/pages/fleet/agents/key/agent.key.component.scss index c11ef7c7a..7fb7e39ac 100644 --- a/ui/src/app/pages/fleet/agents/key/agent.key.component.scss +++ b/ui/src/app/pages/fleet/agents/key/agent.key.component.scss @@ -35,6 +35,7 @@ nb-card { align-content: space-between; align-items: flex-start; justify-content: space-between; + margin: 0; background: transparent; padding: 0.75rem; From 1b3bf23b8ac2f63befaba3ad4659806d0699b2a2 Mon Sep 17 00:00:00 2001 From: Luiz Pegoraro Date: Thu, 31 Aug 2023 14:56:54 -0300 Subject: [PATCH 58/83] fix(maestro): increase log tail on otel-collectors. --- maestro/monitor/monitor.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maestro/monitor/monitor.go b/maestro/monitor/monitor.go index c9fa10ccc..5ac8a7ccd 100644 --- a/maestro/monitor/monitor.go +++ b/maestro/monitor/monitor.go @@ -71,7 +71,7 @@ func (svc *monitorService) Start(ctx context.Context, cancelFunc context.CancelF } func (svc *monitorService) getPodLogs(ctx context.Context, pod k8scorev1.Pod) ([]string, error) { - maxTailLines := int64(1) + maxTailLines := int64(10) sinceSeconds := int64(300) podLogOpts := k8scorev1.PodLogOptions{TailLines: &maxTailLines, SinceSeconds: &sinceSeconds} config, err := rest.InClusterConfig() From c2c7f368f17db75cc71b6cce71f0e91ca4df34ec Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Thu, 31 Aug 2023 16:30:38 -0300 Subject: [PATCH 59/83] improvement(orb-ui): #1095 Add Group page style and design (#2601) --- ui/src/app/@theme/styles/_overrides.scss | 3 + .../add/agent.policy.add.component.html | 53 +++---- .../add/agent.policy.add.component.scss | 3 + .../fleet/agents/add/agent.add.component.html | 86 +++++------ .../fleet/agents/add/agent.add.component.scss | 4 + .../groups/add/agent.group.add.component.html | 146 ++++++++++-------- .../groups/add/agent.group.add.component.scss | 22 ++- .../groups/add/agent.group.add.component.ts | 22 +-- .../agent.group.details.component.html | 21 ++- .../agent.group.details.component.scss | 7 +- .../tag-control/tag-control.component.scss | 2 +- 11 files changed, 206 insertions(+), 163 deletions(-) diff --git a/ui/src/app/@theme/styles/_overrides.scss b/ui/src/app/@theme/styles/_overrides.scss index 8d9c57da1..01705e612 100644 --- a/ui/src/app/@theme/styles/_overrides.scss +++ b/ui/src/app/@theme/styles/_overrides.scss @@ -265,3 +265,6 @@ width: 110px; background-color: #df316f !important; } +p { + font-family: 'Montserrat' !important; +} \ No newline at end of file diff --git a/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.html b/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.html index a27a7707e..b821fec29 100644 --- a/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.html +++ b/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.html @@ -104,19 +104,8 @@

{{ isEdit ? 'Edit Agent Policy' : 'Create Agent Policy'}}

+
- +
@@ -191,17 +192,13 @@

{{ isEdit ? 'Edit Agent Policy' : 'Create Agent Policy'}}

diff --git a/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.scss b/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.scss index 0af6c504f..e9726339e 100644 --- a/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.scss +++ b/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.scss @@ -22,6 +22,9 @@ nb-card-footer { mat-chip nb-icon { font-size: 1rem; } +label { + color: #969FB9; +} ngx-tag-control, ngx-tag-display { margin-top: 20px; diff --git a/ui/src/app/pages/fleet/agents/add/agent.add.component.html b/ui/src/app/pages/fleet/agents/add/agent.add.component.html index c8bdea7fe..c241071fd 100644 --- a/ui/src/app/pages/fleet/agents/add/agent.add.component.html +++ b/ui/src/app/pages/fleet/agents/add/agent.add.component.html @@ -51,16 +51,6 @@

{{isEdit ? 'Edit Agent' : 'New Agent'}}

- +
@@ -89,23 +89,6 @@

{{isEdit ? 'Edit Agent' : 'New Agent'}}

- - + +
{{isEdit ? 'Edit Agent' : 'New Agent'}}
- - +
diff --git a/ui/src/app/pages/fleet/agents/add/agent.add.component.scss b/ui/src/app/pages/fleet/agents/add/agent.add.component.scss index d708b3e00..94227d0d4 100644 --- a/ui/src/app/pages/fleet/agents/add/agent.add.component.scss +++ b/ui/src/app/pages/fleet/agents/add/agent.add.component.scss @@ -107,6 +107,10 @@ nb-card-footer { } } +label { + color: #969FB9; +} + .required { color: #df316f; padding-left: 2px; diff --git a/ui/src/app/pages/fleet/groups/add/agent.group.add.component.html b/ui/src/app/pages/fleet/groups/add/agent.group.add.component.html index b5f3cb496..4101ddb1c 100644 --- a/ui/src/app/pages/fleet/groups/add/agent.group.add.component.html +++ b/ui/src/app/pages/fleet/groups/add/agent.group.add.component.html @@ -68,6 +68,16 @@

{{strings[isEdit ? 'edit' : 'add']['header']}}

+ -
@@ -104,21 +104,20 @@

{{strings[isEdit ? 'edit' : 'add']['header']}}

(tagsChange)="updateMatches()" [(tags)]="selectedTags">
-
-
-

- {{strings.match.matchAny}} {{tagMatch.total}} {{strings.match.agents}} - .  -

-

- {{strings.match.matchNone}} -

-
+
+

+ {{strings.match.matchAny}} {{tagMatch.total}} +  {{strings.match.agents}}  + +

+

+ {{strings.match.matchNone}} +

{{strings[isEdit ? 'edit' : 'add']['header']}}
@@ -166,25 +165,26 @@

{{strings[isEdit ? 'edit' : 'add']['header']}}

- +

{{firstFormGroup.controls.name.value}}

- -

{{firstFormGroup.controls.description.value}}

+ +

{{firstFormGroup.controls.description.value}}

+

No description added

+
@@ -192,14 +192,15 @@

{{strings[isEdit ? 'edit' : 'add']['header']}}

-

- {{strings.match.matchAny}} {{tagMatch.total}} {{strings.match.agents}} - .  +

+ {{strings.match.matchAny}} {{tagMatch.total}} +  {{strings.match.agents}}  +

{{strings.match.matchNone}} @@ -216,15 +217,13 @@

{{strings[isEdit ? 'edit' : 'add']['header']}}

@@ -270,12 +271,23 @@

{{strings[isEdit ? 'edit' : 'add']['header']}}

let-i="index" let-row="row" let-value="value"> - + - {{tag | tagchip}} + style="background-color: #2B3148;" + class="orb-tag-chip" + > + {{ tag.key }}:  + {{ tag.value }} + + + No tag were created @@ -296,7 +308,7 @@

{{strings[isEdit ? 'edit' : 'add']['header']}}

Object.entries(a) @@ -177,8 +171,8 @@ export class AgentGroupAddComponent { prop: 'state', name: 'Status', - flexGrow: 1, - resizeable: false, + resizeable: true, + canAutoResize: false, width: 120, cellTemplate: this.agentStateTemplateRef, }, diff --git a/ui/src/app/pages/fleet/groups/details/agent.group.details.component.html b/ui/src/app/pages/fleet/groups/details/agent.group.details.component.html index da2e7d5d8..c50a42f65 100644 --- a/ui/src/app/pages/fleet/groups/details/agent.group.details.component.html +++ b/ui/src/app/pages/fleet/groups/details/agent.group.details.component.html @@ -27,13 +27,24 @@

{{strings.propNames.tags}}

-
+
- {{tag | tagchip}} + *ngFor="let tag of agentGroup.tags | keyvalue" + style="background-color: #2B3148;" + class="orb-tag-chip" + > + {{ tag.key }}:  + {{ tag.value }} + + + No tag were created
diff --git a/ui/src/app/pages/fleet/groups/details/agent.group.details.component.scss b/ui/src/app/pages/fleet/groups/details/agent.group.details.component.scss index 15e268be0..f28cb3381 100644 --- a/ui/src/app/pages/fleet/groups/details/agent.group.details.component.scss +++ b/ui/src/app/pages/fleet/groups/details/agent.group.details.component.scss @@ -67,4 +67,9 @@ nb-tabset { margin-bottom: 0.4rem; } } - +.background { + background-color: #232940; + padding: 10px; + border-radius: 8px; + margin-bottom: 20px; +} diff --git a/ui/src/app/shared/components/orb/tag-control/tag-control.component.scss b/ui/src/app/shared/components/orb/tag-control/tag-control.component.scss index 7f64feb57..1bb06d106 100644 --- a/ui/src/app/shared/components/orb/tag-control/tag-control.component.scss +++ b/ui/src/app/shared/components/orb/tag-control/tag-control.component.scss @@ -17,7 +17,7 @@ mat-chip nb-icon { } .add-button { border: none !important; - background: #2F3D59 !important; + background: #1e2941 !important; } .add-button:disabled{ background-color: transparent !important; From 5159884d6e0153b0f7e99470e1c232af4319b2d4 Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Thu, 31 Aug 2023 17:22:37 -0300 Subject: [PATCH 60/83] fix(orb-ui): Adjustments on agent key window, command with config file (#2602) * improve(orb-ui): #40 Agent Credentials, add tooltip and link to documentation * tooltip --- .../app/pages/dashboard/dashboard.component.scss | 12 ++++++------ .../fleet/agents/key/agent.key.component.html | 14 ++++++++++++-- .../fleet/agents/key/agent.key.component.scss | 15 ++++++++++++++- 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/ui/src/app/pages/dashboard/dashboard.component.scss b/ui/src/app/pages/dashboard/dashboard.component.scss index f91f42262..af7247aa2 100644 --- a/ui/src/app/pages/dashboard/dashboard.component.scss +++ b/ui/src/app/pages/dashboard/dashboard.component.scss @@ -96,16 +96,16 @@ h6 { line-height: 24px !important; & > a { - white-space: nowrap; - padding: 0 0.3rem; - background-color: #3089fc; + white-space: nowrap !important; + padding: 0 0.3rem !important; + background-color: #3089fc !important; font-weight: 700 !important; text-decoration: none !important; - text-underline: none; + text-underline: none !important; color: #ffffff !important; border-radius: 10px; - link: #ffffff; - fill: #3089fc; + link: #ffffff !important; + fill: #3089fc !important; } } } diff --git a/ui/src/app/pages/fleet/agents/key/agent.key.component.html b/ui/src/app/pages/fleet/agents/key/agent.key.component.html index 406545aff..c908d8b2a 100644 --- a/ui/src/app/pages/fleet/agents/key/agent.key.component.html +++ b/ui/src/app/pages/fleet/agents/key/agent.key.component.html @@ -34,7 +34,7 @@

See here + target="_blank">Click here   for more advanced options.

@@ -82,6 +82,9 @@ pack="eva"> + + 
@@ -98,8 +101,15 @@
             {{ fileConfigCommandShow }}
- + +

+ Click here + +   to learn more about how create and apply configuration files. +

diff --git a/ui/src/app/pages/fleet/agents/key/agent.key.component.scss b/ui/src/app/pages/fleet/agents/key/agent.key.component.scss index 7fb7e39ac..a95937510 100644 --- a/ui/src/app/pages/fleet/agents/key/agent.key.component.scss +++ b/ui/src/app/pages/fleet/agents/key/agent.key.component.scss @@ -12,6 +12,9 @@ nb-card { button { float: right; } + nb-icon { + float: right ; + } } nb-card-body { @@ -21,7 +24,7 @@ nb-card { padding: 0; p { - color: #969fb9; + color: #fff; } .ns1-red { @@ -87,3 +90,13 @@ nb-card { color: #df316f !important; } } +a { + white-space: nowrap !important; + padding: 0 0.3rem !important; + background-color: #3089fc !important; + font-weight: 700 !important; + text-decoration: none !important; + color: #ffffff !important; + border-radius: 10px; + fill: #3089fc !important; +} From da7e998f01112eb7a7f4ef1694d76b731ff1264b Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Fri, 1 Sep 2023 13:26:06 -0300 Subject: [PATCH 61/83] feat(orb-ui): #1106 Agent View, include provisioning command with config file (#2603) --- .../agent-provisioning.component.html | 82 +++++++++++++++---- .../agent-provisioning.component.scss | 41 ++++++++-- .../agent-provisioning.component.ts | 68 ++++++++++----- 3 files changed, 147 insertions(+), 44 deletions(-) diff --git a/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.html b/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.html index 992f267c0..54f375229 100644 --- a/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.html +++ b/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.html @@ -1,6 +1,6 @@ - + - Provisioning Command + Provisioning Commands -

- To use the provisioning command, you must replace AGENT_KEY with the Agent Key given to you during agent - creation. If you have lost the Agent Key, you must remove and create a new agent. -

- 
-      
-      {{ command2show }}
-
+ + + 
+          
+          
+            {{ defaultCommandShow }}
+          
+
+ + + + + Provisioning Command with Configuration File + + + + + + 
+          
+          
+            {{ fileConfigCommandShow }}
+          
+
+ + +

+ Click here + +   to learn more about how create and apply configuration files. +

diff --git a/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.scss b/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.scss index da2bdb0d6..cf3f935a0 100644 --- a/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.scss +++ b/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.scss @@ -17,9 +17,21 @@ nb-card { border-radius: 0.5rem; color: #969fb9; padding: 0.5rem 1rem; + button { + float: right; + margin: 0; + } + nb-icon { + float: right ; + } } nb-card-body { + border-bottom-left-radius: 0.5rem; + border-bottom-right-radius: 0.5rem; + margin: 0 2rem 0 2rem; + padding: 0; + label { color: #969fb9; } @@ -35,22 +47,27 @@ nb-card { } pre { - background: #1c2339; - border-radius: 0.5rem; - color: #fff; - font-weight: 400; - padding: 0.75rem; + display: flex; + flex-direction: row-reverse; + flex-wrap: wrap; + align-content: space-between; + align-items: flex-start; + justify-content: space-between; + margin: 0; + background: transparent; + padding: 0.75rem; + border-radius: 0.5rem; white-space: pre-line; button { background: transparent; border: 0 transparent; color: #969fb9; + top: -0.25rem; float: right; - position: relative; right: -0.5rem; - top: -0.25rem; + outline: none; } code { @@ -105,3 +122,13 @@ button { outline: none !important; margin-right: 15px; } +a { + white-space: nowrap !important; + padding: 0 0.3rem !important; + background-color: #ff9f05 !important; + font-weight: 700 !important; + text-decoration: none !important; + color: #ffffff !important; + border-radius: 10px; + fill: #3089fc !important; +} diff --git a/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.ts b/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.ts index c9ac54d60..0e9872e1e 100644 --- a/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.ts +++ b/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.ts @@ -12,25 +12,28 @@ export class AgentProvisioningComponent implements OnInit { agentStates = AgentStates; - command2copy: string; - copyCommandIcon: string; availableOS = [AvailableOS.DOCKER]; selectedOS = AvailableOS.DOCKER; - command2show: string; + defaultCommandCopy: string; + defaultCommandShow: string; + fileConfigCommandCopy: string; + fileConfigCommandShow: string; hideCommand: boolean; + hideCommand2: boolean; + hideCommand3: boolean; constructor() { - this.command2copy = ""; - this.command2show = ""; this.copyCommandIcon = "copy-outline"; } ngOnInit(): void { + this.hideCommand2 = false; + this.hideCommand3 = true; this.hideCommand = this.agent?.state !== this.agentStates.new; this.makeCommand2Copy(); } @@ -45,27 +48,52 @@ export class AgentProvisioningComponent implements OnInit { } makeCommand2Copy() { - // TODO: future - store this elsewhere - if (this.selectedOS === AvailableOS.DOCKER) { - this.command2copy = `docker run -d --restart=always --net=host \\ --e ORB_CLOUD_ADDRESS=${document.location.hostname} \\ --e ORB_CLOUD_MQTT_ID=${this.agent?.id} \\ --e ORB_CLOUD_MQTT_CHANNEL_ID=${this.agent?.channel_id} \\ --e ORB_CLOUD_MQTT_KEY="AGENT_KEY" \\ + this.defaultCommandCopy = `docker run -d --restart=always --net=host \\ +-e ORB_CLOUD_ADDRESS=${ document.location.hostname } \\ +-e ORB_CLOUD_MQTT_ID=${ this.agent.id } \\ +-e ORB_CLOUD_MQTT_CHANNEL_ID=${ this.agent.channel_id } \\ +-e ORB_CLOUD_MQTT_KEY="AGENT_KEY"\\ -e PKTVISOR_PCAP_IFACE_DEFAULT=auto \\ orbcommunity/orb-agent`; - this.command2show = `docker run -d --restart=always --net=host \\ --e ORB_CLOUD_ADDRESS=${document.location.hostname} \\ --e ORB_CLOUD_MQTT_ID=${this.agent?.id} \\ --e ORB_CLOUD_MQTT_CHANNEL_ID=${this.agent?.channel_id} \\ --e ORB_CLOUD_MQTT_KEY=AGENT_KEY \\ + this.defaultCommandShow = `docker run -d --restart=always --net=host \\ +-e ORB_CLOUD_ADDRESS=${ document.location.hostname } \\ +-e ORB_CLOUD_MQTT_ID=${ this.agent.id } \\ +-e ORB_CLOUD_MQTT_CHANNEL_ID=${ this.agent.channel_id } \\ +-e ORB_CLOUD_MQTT_KEY=AGENT_KEY\\ -e PKTVISOR_PCAP_IFACE_DEFAULT=auto \\ orbcommunity/orb-agent`; - } + + this.fileConfigCommandCopy = `docker run -d --restart=always --net=host \\ +-e ORB_CLOUD_ADDRESS=${ document.location.hostname } \\ +-e ORB_CLOUD_MQTT_ID=${ this.agent.id } \\ +-e ORB_CLOUD_MQTT_CHANNEL_ID=${ this.agent.channel_id } \\ +-e ORB_CLOUD_MQTT_KEY="AGENT_KEY"\\ +-e PKTVISOR_PCAP_IFACE_DEFAULT=auto \\ +-v \${PWD}/:/usr/local/orb/ \\ +orbcommunity/orb-agent run -c /usr/local/orb/agent.yaml`; + + this.fileConfigCommandShow = `docker run -d --restart=always --net=host \\ +-e ORB_CLOUD_ADDRESS=${ document.location.hostname } \\ +-e ORB_CLOUD_MQTT_ID=${ this.agent.id } \\ +-e ORB_CLOUD_MQTT_CHANNEL_ID=${ this.agent.channel_id } \\ +-e ORB_CLOUD_MQTT_KEY=AGENT_KEY\\ +-e PKTVISOR_PCAP_IFACE_DEFAULT=auto \\ +-v \${PWD}/:/usr/local/orb/ \\ +orbcommunity/orb-agent run -c /usr/local/orb/agent.yaml`; } - toggleProvisioningCommand() { - this.hideCommand = !this.hideCommand; +toggleProvisioningCommand(command: string) { + switch (command) { + case 'hideCommand': + this.hideCommand = !this.hideCommand; + break; + case 'hideCommand2': + this.hideCommand2 = !this.hideCommand2; + break; + case 'hideCommand3': + this.hideCommand3 = !this.hideCommand3; + break; } } +} From 3e813402730ed1fe4881ad72ac3263b1dba2a73c Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Fri, 1 Sep 2023 16:23:51 -0300 Subject: [PATCH 62/83] improvement(orb-ui): #1108 Update input and forms styles according to figma (#2604) --- ui/src/app/@theme/styles/_overrides.scss | 48 ++++++++++++++++++- .../dataset-from/dataset-from.component.html | 8 ++-- .../add/agent.policy.add.component.html | 39 +++++++-------- .../fleet/agents/add/agent.add.component.html | 40 ++++++++-------- .../fleet/agents/add/agent.add.component.scss | 8 +++- .../groups/add/agent.group.add.component.html | 44 ++++++++--------- .../agent-information.component.html | 7 +-- .../agent-information.component.scss | 5 +- .../policy-details.component.html | 11 ++--- .../policy-details.component.scss | 3 ++ .../sink-details/sink-details.component.html | 29 +++++------ .../tag-control/tag-control.component.html | 13 ++--- .../tag-control/tag-control.component.scss | 3 -- 13 files changed, 156 insertions(+), 102 deletions(-) diff --git a/ui/src/app/@theme/styles/_overrides.scss b/ui/src/app/@theme/styles/_overrides.scss index 01705e612..4eea19ebc 100644 --- a/ui/src/app/@theme/styles/_overrides.scss +++ b/ui/src/app/@theme/styles/_overrides.scss @@ -267,4 +267,50 @@ } p { font-family: 'Montserrat' !important; -} \ No newline at end of file +} +button { + font-family: 'Montserrat' !important; +} +label { + font-family: 'Montserrat' !important; +} +.input-label { + color: #fff !important; + font-size: 14px !important; + font-weight: 500 !important; +} +input { + background-color: transparent !important; +} +.next-button { + border-radius: 16px !important; + background: #3089FC !important; + padding: 8px 24px !important; + color: #fff !important; + border: none !important; + outline: none !important; + font-size: 14px !important; + font-weight: 600 !important; + transition: background-color 0.3s ease !important; +} +.next-button:hover { + background-color: #509afc!important; +} +.next-button:disabled { + background: #2b3148 !important; +} +.cancel-back-button { + border-radius: 16px !important;; + padding: 8px 24px !important; + background-color: transparent !important; + color: #3089FC !important; + border: none !important; + outline: none !important; + font-size: 14px !important; + font-weight: 600 !important; + transition: background-color 0.3s ease !important; + margin-right: 0 !important; +} +.cancel-back-button:hover { + background-color: rgba(255, 255, 255, 0.05) !important; +} diff --git a/ui/src/app/pages/datasets/dataset-from/dataset-from.component.html b/ui/src/app/pages/datasets/dataset-from/dataset-from.component.html index a2a370d44..952635bfd 100644 --- a/ui/src/app/pages/datasets/dataset-from/dataset-from.component.html +++ b/ui/src/app/pages/datasets/dataset-from/dataset-from.component.html @@ -18,14 +18,14 @@
- + *
- + *
@@ -69,7 +69,7 @@
- + *
- + *
diff --git a/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.html b/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.html index b821fec29..6f32dda6a 100644 --- a/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.html +++ b/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.html @@ -34,9 +34,8 @@

{{ isEdit ? 'Edit Agent Policy' : 'Create Agent Policy'}}

- * + class="input-label" + for="name">Policy Name*
{{ isEdit ? 'Edit Agent Policy' : 'Create Agent Policy'}} fullWidth="true" [status]="detailsFG?.controls.name.dirty ? (!detailsFG.controls.name.valid ? 'danger' : 'success') : 'basic'" id="name" - nbInput/> + nbInput + placeholder="Policy Name"/> -

+

Name is required! -

-

+

+
Name must start with a letter or "_" and contain only letters, numbers, "-" or "_" -

-

+

+
Name must be less than {{detailsFG.controls.name.errors?.maxlength.requiredLength}} characters -

+
{{ isEdit ? 'Edit Agent Policy' : 'Create Agent Policy'}} formControlName="description" fullWidth="true" id="description" - nbInput/> + nbInput + placeholder="Policy Description"/>

Description must be less than {{detailsFG.controls.description.errors?.maxlength.requiredLength}} characters @@ -82,7 +83,7 @@

{{ isEdit ? 'Edit Agent Policy' : 'Create Agent Policy'}}

{{ isEdit ? 'Edit Agent Policy' : 'Create Agent Policy'}}

- +
@@ -110,7 +111,7 @@

{{ isEdit ? 'Edit Agent Policy' : 'Create Agent Policy'}}

(click)="goBack()" data-orb-qa-id="button#cancel" ghost - nbButton + class="cancel-back-button" shape="round" status="primary" type="button"> @@ -121,7 +122,7 @@

{{ isEdit ? 'Edit Agent Policy' : 'Create Agent Policy'}}

[disabled]="!detailsFG?.valid" class="next-button" data-orb-qa-id="button#next" - nbButton + class="next-button" nbStepperNext shape="round" type="button" @@ -195,7 +196,7 @@

{{ isEdit ? 'Edit Agent Policy' : 'Create Agent Policy'}}

(click)="goBack()" data-orb-qa-id="button#cancel" ghost - nbButton + class="cancel-back-button" status="primary" type="button"> {{ strings.stepper.cancel }} @@ -203,7 +204,7 @@

{{ isEdit ? 'Edit Agent Policy' : 'Create Agent Policy'}}

- {{ agent?.key }} + {{ agent?.key }} @@ -61,7 +61,7 @@ {{ defaultCommandShow }} diff --git a/ui/src/app/pages/fleet/agents/key/agent.key.component.scss b/ui/src/app/pages/fleet/agents/key/agent.key.component.scss index a95937510..c87226b2e 100644 --- a/ui/src/app/pages/fleet/agents/key/agent.key.component.scss +++ b/ui/src/app/pages/fleet/agents/key/agent.key.component.scss @@ -59,6 +59,7 @@ nb-card { code { color: #ffffff; line-height: 2.5 !important; + font-size: 16px !important; } } } From 4a75c64f5b3d3dba98bcd6c06be1034f8b37c956 Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Tue, 5 Sep 2023 17:10:24 -0300 Subject: [PATCH 64/83] feat(orb-ui): #1110 New profile page (#2615) --- .../app/pages/profile/profile.component.html | 142 ++++++++++------ .../app/pages/profile/profile.component.scss | 151 ++++++++++++++++++ ui/src/app/pages/profile/profile.component.ts | 112 ++++++++++--- 3 files changed, 331 insertions(+), 74 deletions(-) diff --git a/ui/src/app/pages/profile/profile.component.html b/ui/src/app/pages/profile/profile.component.html index 917c60901..7ad1a6db2 100644 --- a/ui/src/app/pages/profile/profile.component.html +++ b/ui/src/app/pages/profile/profile.component.html @@ -1,62 +1,108 @@ +
+
+

Account Information

+

User Profile

+
+
-
- - User Information +
+
+ +
+

User Name

+
+

{{ user?.fullName }}

+
+
+ +
+
+ + + + + +
+ +
+ +
+
-
- - Create Policy through {{isJsonMode ? "JSON editor" : "YAML editor"}} - +
+ +
-
-
-

Paste or Upload your JSON configuration

- - -
-
- - -
-
-
-
-

Paste or Upload your YAML configuration

- - -
-
+
+

Paste or Upload your {{isJsonMode ? 'Json' : 'Yaml'}} configuration

+ + +
+
+
+ + + + + -
+ +
+ +
+ + + +
+ Review & Confirm +
+ +
+
+
+ +

{{detailsFG.controls.name.value}}

+
+
+
+
+
+
+ +

{{detailsFG.controls.description.value}}

+

No description provided

+
+
+
+
+
+
+ +

{{detailsFG.controls.backend.value}}

+
+
+
+
+
+ + +
+
+
+ + +
+ + + + + + Group: {{ group?.name }} + + + + + + Group don't have any agents. + + + + + + + Policy not assigned to any group +

{{ errors.nogroup }} diff --git a/ui/src/app/shared/components/orb/policy/policy-groups/policy-groups.component.scss b/ui/src/app/shared/components/orb/policy/policy-groups/policy-groups.component.scss index 87a560751..28d543bad 100644 --- a/ui/src/app/shared/components/orb/policy/policy-groups/policy-groups.component.scss +++ b/ui/src/app/shared/components/orb/policy/policy-groups/policy-groups.component.scss @@ -120,16 +120,25 @@ nb-card { color: #df316f !important; } } - -::ng-deep .agent-group-button { +.no-agents { + color: #fff; + font-family: 'Roboto'; + font-size: 13px; + font-weight: 600; + line-height: 1.5rem; +} +.agent-group-button { background-color: transparent !important; background-repeat: no-repeat !important; - border: solid #ffffff !important; - border-radius: 15px !important; - border-width: thin !important; + border: none !important; cursor: pointer !important; outline: none !important; overflow: hidden !important; + color: #fff; + font-family: 'Montserrat', sans-serif; + font-size: 13px; + font-weight: 600; + line-height: 1.5rem; } .agent-group-accent { @@ -141,3 +150,38 @@ nb-card { color: #df316f !important; font-weight: 600; } + +::ng-deep nb-accordion { + border: none !important; + border-radius: 8px !important; + display: grid; + padding: -0.1rem !important; + margin: -0.1rem !important; + text-subtitle-line-height: 1rem; + box-shadow: none !important; + + > nb-accordion-item { + border: none !important; + border-radius: 8px !important; + padding: -0.1rem !important; + margin: -0.1rem !important; + + > nb-accordion-item-header { + border: none !important; + border-radius: 8px !important; + padding: 0.1rem 0 !important; + } + + > nb-accordion-item-body { + border: none !important; + border-radius: 8px !important; + display: grid; + padding: 0 10px 0 10px; + background-color: #1c2339; + + .item-body { + padding: 0.1em !important; + } + } + } +} From f61aada1c15aa8230eb6662cd05560f979278148 Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Mon, 18 Sep 2023 13:43:28 -0300 Subject: [PATCH 77/83] feat(orb-ui): #1185 Search by name on list pages (#2633) --- ui/src/app/common/services/filter.service.ts | 4 ++ .../components/filter/filter.component.html | 44 ++++++++++++------- .../components/filter/filter.component.scss | 22 ++++++++++ .../components/filter/filter.component.ts | 29 +++++++++++- 4 files changed, 80 insertions(+), 19 deletions(-) diff --git a/ui/src/app/common/services/filter.service.ts b/ui/src/app/common/services/filter.service.ts index 329f8ee18..8d1d46701 100644 --- a/ui/src/app/common/services/filter.service.ts +++ b/ui/src/app/common/services/filter.service.ts @@ -74,6 +74,10 @@ export class FilterService { } } + removeFilterByParam(param: string) { + this.removeFilter(this._filters.findIndex((filter) => filter.param === param && filter.name === 'Name' && filter)); + } + // make a decorator out of this? createFilteredList() { return ( diff --git a/ui/src/app/shared/components/filter/filter.component.html b/ui/src/app/shared/components/filter/filter.component.html index 49209d6d7..808411de4 100644 --- a/ui/src/app/shared/components/filter/filter.component.html +++ b/ui/src/app/shared/components/filter/filter.component.html @@ -27,30 +27,37 @@ - + + +

+ + +
+ - - {{ filter?.exact ? filter.name + ": '" + filter?.param + "'" : filter.name + ': ' +filter?.param}} - - + + + {{ filter?.exact ? filter.name + ": '" + filter?.param + "'" : filter.name + ': ' + filter?.param }} + + + +
+
+ +
diff --git a/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.scss b/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.scss index 7fbeb897c..19ed35e11 100644 --- a/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.scss +++ b/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.scss @@ -250,3 +250,4 @@ header { display: flex; align-items: center; } + diff --git a/ui/src/app/pages/fleet/agents/list/agent.list.component.scss b/ui/src/app/pages/fleet/agents/list/agent.list.component.scss index b3d73df0f..0612f71ef 100644 --- a/ui/src/app/pages/fleet/agents/list/agent.list.component.scss +++ b/ui/src/app/pages/fleet/agents/list/agent.list.component.scss @@ -187,6 +187,8 @@ input[type=checkbox] { font-weight: 600; text-transform: none !important; width: 160px; + opacity: 0; + animation: appear 0.3s forwards; &.btn-disabled { background: #2b3148; diff --git a/ui/src/app/pages/fleet/agents/view/agent.view.component.html b/ui/src/app/pages/fleet/agents/view/agent.view.component.html index 1956af161..041f6fb04 100644 --- a/ui/src/app/pages/fleet/agents/view/agent.view.component.html +++ b/ui/src/app/pages/fleet/agents/view/agent.view.component.html @@ -38,6 +38,10 @@
+
+ +
+
diff --git a/ui/src/app/pages/profile/profile.component.html b/ui/src/app/pages/profile/profile.component.html index def21abd0..61cfc10e5 100644 --- a/ui/src/app/pages/profile/profile.component.html +++ b/ui/src/app/pages/profile/profile.component.html @@ -4,7 +4,12 @@

User Profile / Settings

-
+ +
+ +
+ +
diff --git a/ui/src/app/pages/sinks/view/sink.view.component.html b/ui/src/app/pages/sinks/view/sink.view.component.html index ae73c8d30..51b3822f5 100644 --- a/ui/src/app/pages/sinks/view/sink.view.component.html +++ b/ui/src/app/pages/sinks/view/sink.view.component.html @@ -61,6 +61,10 @@

{{ strings.sink.view.header }}

+
+ +
+
From 4f7953b5c47627859dab30779b54ef4d41efaccf Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Wed, 20 Sep 2023 16:57:16 -0300 Subject: [PATCH 80/83] fix(orb-ui): Yaml as main and only sink config language (#2644) * fix(orb-ui): Yaml as main and only sink config language * remove unnecessary comments --- .../app/pages/sinks/add/sink-add.component.ts | 48 +++++++++----- .../pages/sinks/view/sink.view.component.ts | 64 +++++++++---------- .../sink-config/sink-config.component.html | 7 +- .../sink/sink-config/sink-config.component.ts | 38 ++++++----- 4 files changed, 86 insertions(+), 71 deletions(-) diff --git a/ui/src/app/pages/sinks/add/sink-add.component.ts b/ui/src/app/pages/sinks/add/sink-add.component.ts index d368dd044..82c088f50 100644 --- a/ui/src/app/pages/sinks/add/sink-add.component.ts +++ b/ui/src/app/pages/sinks/add/sink-add.component.ts @@ -55,7 +55,13 @@ export class SinkAddComponent { return false; } - return !this.editor.checkEmpty(config.authentication) && !this.editor.checkEmpty(config.exporter) && detailsValid; + return !this.editor.checkEmpty(config.authentication) && !this.editor.checkEmpty(config.exporter) && detailsValid && !this.checkString(config); + } + checkString(config: any): boolean { + if (typeof config.authentication.password !== 'string' || typeof config.authentication.username !== 'string') { + return true; + } + return false; } createSink() { @@ -68,22 +74,30 @@ export class SinkAddComponent { let payload = {}; - if (this.editor.isJson(configSink)) { - const config = JSON.parse(configSink); - payload = { - ...details, - tags, - config, - } as Sink; - } - else { - payload = { - ...details, - tags, - format: 'yaml', - config_data: configSink, - } as Sink; - } + const config = YAML.parse(configSink); + + payload = { + ...details, + tags, + config, + } as Sink; + + // if (this.editor.isJson(configSink)) { + // const config = JSON.parse(configSink); + // payload = { + // ...details, + // tags, + // config, + // } as Sink; + // } + // else { + // payload = { + // ...details, + // tags, + // format: 'yaml', + // config_data: configSink, + // } as Sink; + // } this.sinksService.addSink(payload).subscribe(() => { this.notificationsService.success('Sink successfully created', ''); diff --git a/ui/src/app/pages/sinks/view/sink.view.component.ts b/ui/src/app/pages/sinks/view/sink.view.component.ts index b10cc1823..420bb7bf3 100644 --- a/ui/src/app/pages/sinks/view/sink.view.component.ts +++ b/ui/src/app/pages/sinks/view/sink.view.component.ts @@ -94,14 +94,22 @@ export class SinkViewComponent implements OnInit, OnChanges, OnDestroy { } else if (this.editor.isYaml(configSink)) { config = YAML.parse(configSink); } else { - return false; + return false; } + if (this.editMode.config) { - configValid = !this.editor.checkEmpty(config.authentication) && !this.editor.checkEmpty(config.exporter); + configValid = !this.editor.checkEmpty(config.authentication) && !this.editor.checkEmpty(config.exporter) && !this.checkString(config); } return detailsValid && configValid; } + checkString(config: any): boolean { + if (typeof config.authentication.password !== 'string' || typeof config.authentication.username !== 'string') { + return true; + } + return false; + } + discard() { this.editMode.details = false; this.editMode.config = false; @@ -113,40 +121,30 @@ export class SinkViewComponent implements OnInit, OnChanges, OnDestroy { const sinkDetails = this.detailsComponent.formGroup?.value; const tags = this.detailsComponent.selectedTags; const configSink = this.configComponent.code; - + const details = { ...sinkDetails, tags }; - const isJson = this.editor.isJson(configSink); - - let payload: Sink = { id, backend }; - - if (isJson) { - const config = JSON.parse(configSink); - - if (this.editMode.details && !this.editMode.config) { - payload = { ...payload, ...details }; - } else if (!this.editMode.details && this.editMode.config) { - payload = { ...payload, config }; - } else { - payload = { ...payload, ...details, config }; - } - } else { - if (this.editMode.details && !this.editMode.config) { + + let payload = { id, backend, config: {}}; + + try { + const config = YAML.parse(configSink); + payload.config = config; + + if (this.editMode.details) { payload = { ...payload, ...details }; - } else if (!this.editMode.details && this.editMode.config) { - payload = { ...payload, format: 'yaml', config_data: configSink }; - } else { - payload = { ...payload, ...details, format: 'yaml', config_data: configSink }; } - } - - try { - this.sinks.editSink(payload).subscribe((resp) => { - this.discard(); - this.sink = resp; - this.orb.refreshNow(); - this.notifications.success('Sink updated successfully', ''); - this.isRequesting = false; - }); + + this.sinks.editSink(payload as Sink).subscribe( + (resp) => { + this.discard(); + this.sink = resp; + this.orb.refreshNow(); + this.notifications.success('Sink updated successfully', ''); + this.isRequesting = false; + }, + (err) => { + this.isRequesting = false; + }); } catch (err) { this.notifications.error('Failed to edit Sink', 'Error: Invalid configuration'); } diff --git a/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.html b/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.html index f700ca43c..05d4d1e02 100644 --- a/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.html +++ b/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.html @@ -18,12 +18,12 @@ style="color: #df316f !important;"> Discard - + -->
@@ -41,8 +41,7 @@ [(ngModel)]="code" [options]="editorOptionsYaml" class="code-editor" - ngDefaultControl - *ngIf="isYaml"> + ngDefaultControl>
diff --git a/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.ts b/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.ts index 8bba77fce..ce30aa4b3 100644 --- a/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.ts +++ b/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.ts @@ -78,7 +78,7 @@ export class SinkConfigComponent implements OnInit, OnChanges { private fb: FormBuilder, private orb: OrbService, ) { - this.isYaml = false; + this.isYaml = true; this.sink = {}; this.editMode = false; this.editModeChange = new EventEmitter(); @@ -111,17 +111,18 @@ export class SinkConfigComponent implements OnInit, OnChanges { ngOnInit(): void { if (this.createMode) { this.toggleEdit(true); - this.code = JSON.stringify(this.sinkConfigSchemaOtlp, null, 2); + this.code = YAML.stringify(this.sinkConfigSchemaOtlp); } else { - if (this.sink.config_data && this.sink.format === 'yaml') { - this.isYaml = true; - this.code = YAML.stringify(this.sink.config_data); - } - else if (this.isJson(JSON.stringify(this.sink.config))) { - this.isYaml = false; - this.code = JSON.stringify(this.sink.config, null, 2); - } + // if (this.sink.config_data && this.sink.format === 'yaml') { + // this.isYaml = true; + const parsedCode = YAML.parse(JSON.stringify(this.sink.config)); + this.code = YAML.stringify(parsedCode); + // } + // else if (this.isJson(JSON.stringify(this.sink.config))) { + // this.isYaml = false; + // this.code = JSON.stringify(this.sink.config, null, 2); + // } } } @@ -132,7 +133,7 @@ export class SinkConfigComponent implements OnInit, OnChanges { } catch { return false; } -} + } ngOnChanges(changes: SimpleChanges) { const { editMode, sinkBackend } = changes; if (editMode && !editMode.firstChange) { @@ -146,20 +147,23 @@ ngOnChanges(changes: SimpleChanges) { this.code = this.isYaml ? YAML.stringify(sinkConfigSchema, null) : JSON.stringify(sinkConfigSchema, null, 2); + this.code = YAML.stringify(sinkConfigSchema, null); } } updateForm() { - const configData = this.sink.config_data; - const isYamlFormat = this.sink.format === 'yaml'; + const configData = this.sink.config; + // const isYamlFormat = this.sink.format === 'yaml'; if (this.editMode) { - this.isYaml = isYamlFormat; - this.code = isYamlFormat ? YAML.stringify(configData) : JSON.stringify(this.sink.config, null, 2); + // this.isYaml = isYamlFormat; + // this.code = isYamlFormat ? YAML.stringify(configData) : JSON.stringify(this.sink.config, null, 2); + this.code = YAML.stringify(configData); } else { this.formControl = this.fb.control(null, [Validators.required]); - this.isYaml = isYamlFormat; - this.code = isYamlFormat ? YAML.stringify(configData) : JSON.stringify(this.sink.config, null, 2); + // this.isYaml = isYamlFormat; + // this.code = isYamlFormat ? YAML.stringify(configData) : JSON.stringify(this.sink.config, null, 2); + this.code = YAML.stringify(configData); } this.formControl = this.fb.control(this.code, [Validators.required]); From 4750f3eba2f2b696088888ae81bdbbf67e0ae5f4 Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Thu, 21 Sep 2023 17:18:31 -0300 Subject: [PATCH 81/83] fixes(orb-ui): Polling stopping | resquest button disabled (#2645) --- ui/src/app/common/services/orb.service.ts | 4 ++++ .../view/agent.policy.view.component.html | 10 +++++----- .../view/agent.policy.view.component.ts | 11 +++++++++-- .../pages/fleet/agents/view/agent.view.component.ts | 1 + .../fleet/groups/add/agent.group.add.component.ts | 6 +++++- ui/src/app/pages/profile/profile.component.ts | 3 +++ ui/src/app/pages/sinks/view/sink.view.component.ts | 1 + .../agent-information/agent-information.component.ts | 3 +++ .../policy/policy-groups/policy-groups.component.scss | 1 + .../policy-interface/policy-interface.component.scss | 2 +- 10 files changed, 33 insertions(+), 9 deletions(-) diff --git a/ui/src/app/common/services/orb.service.ts b/ui/src/app/common/services/orb.service.ts index c74182dfa..acf5f0aa8 100644 --- a/ui/src/app/common/services/orb.service.ts +++ b/ui/src/app/common/services/orb.service.ts @@ -53,11 +53,15 @@ export class OrbService implements OnDestroy { // next to force refresh private forceRefresh: Subject; + isPollingPaused = false; + pausePolling() { + this.isPollingPaused = true; this.pollController$.next(PollControls.PAUSE); } startPolling() { + this.isPollingPaused = false; this.pollController$.next(PollControls.RESUME); } diff --git a/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.html b/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.html index e8a4c8740..4ba6ca33d 100644 --- a/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.html +++ b/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.html @@ -44,15 +44,15 @@

Policy View

- +
diff --git a/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.ts b/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.ts index e67baf461..04fffa9ef 100644 --- a/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.ts +++ b/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.ts @@ -29,6 +29,7 @@ import { PolicyDuplicateComponent } from '../duplicate/agent.policy.duplicate.co import { NbDialogService } from '@nebular/theme'; import { updateMenuItems } from 'app/pages/pages-menu'; import { AgentPolicyDeleteComponent } from '../delete/agent.policy.delete.component'; +import { error } from 'console'; @Component({ selector: 'ngx-agent-view', @@ -162,13 +163,18 @@ export class AgentPolicyViewComponent implements OnInit, OnDestroy { backend, } as AgentPolicy; - this.policiesService.editAgentPolicy(payload).subscribe((resp) => { + this.policiesService.editAgentPolicy(payload).subscribe( + (resp) => { this.notifications.success('Agent Policy updated successfully', ''); this.discard(); this.policy = resp; this.orb.refreshNow(); this.isRequesting = false; - }); + }, + (error) => { + this.isRequesting = false; + } + ); } catch (err) { this.notifications.error( @@ -220,6 +226,7 @@ export class AgentPolicyViewComponent implements OnInit, OnDestroy { ngOnDestroy() { this.policySubscription?.unsubscribe(); + this.orb.isPollingPaused ? this.orb.startPolling() : null; this.orb.killPolling.next(); } openDeleteModal() { diff --git a/ui/src/app/pages/fleet/agents/view/agent.view.component.ts b/ui/src/app/pages/fleet/agents/view/agent.view.component.ts index 5fa487038..ca6091fa6 100644 --- a/ui/src/app/pages/fleet/agents/view/agent.view.component.ts +++ b/ui/src/app/pages/fleet/agents/view/agent.view.component.ts @@ -89,6 +89,7 @@ export class AgentViewComponent implements OnInit, OnDestroy { ngOnDestroy() { this.agentSubscription?.unsubscribe(); + this.orb.isPollingPaused ? this.orb.startPolling() : null; this.orb.killPolling.next(); } diff --git a/ui/src/app/pages/fleet/groups/add/agent.group.add.component.ts b/ui/src/app/pages/fleet/groups/add/agent.group.add.component.ts index 784962127..c0ca0fb96 100644 --- a/ui/src/app/pages/fleet/groups/add/agent.group.add.component.ts +++ b/ui/src/app/pages/fleet/groups/add/agent.group.add.component.ts @@ -280,12 +280,16 @@ export class AgentGroupAddComponent if (this.isEdit) { this.agentGroupsService .editAgentGroup({ ...payload, id: this.agentGroupID }) - .subscribe(() => { + .subscribe( + (resp) => { this.notificationsService.success( 'Agent Group successfully updated', '', ); this.goBack(); + }, + (error) => { + this.isRequesting = false; }); } else { this.agentGroupsService.addAgentGroup(payload).subscribe(() => { diff --git a/ui/src/app/pages/profile/profile.component.ts b/ui/src/app/pages/profile/profile.component.ts index b7049cc41..b69e0e366 100644 --- a/ui/src/app/pages/profile/profile.component.ts +++ b/ui/src/app/pages/profile/profile.component.ts @@ -94,6 +94,9 @@ export class ProfileComponent implements OnInit { this.toggleEdit(''); this.isRequesting = false; }, + error => { + this.isRequesting = false; + } ); } diff --git a/ui/src/app/pages/sinks/view/sink.view.component.ts b/ui/src/app/pages/sinks/view/sink.view.component.ts index 420bb7bf3..490876744 100644 --- a/ui/src/app/pages/sinks/view/sink.view.component.ts +++ b/ui/src/app/pages/sinks/view/sink.view.component.ts @@ -161,6 +161,7 @@ export class SinkViewComponent implements OnInit, OnChanges, OnDestroy { ngOnDestroy(): void { this.sinkSubscription.unsubscribe(); + this.orb.isPollingPaused ? this.orb.startPolling() : null; this.orb.killPolling.next(); } openDeleteModal() { diff --git a/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.ts b/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.ts index de842595b..5189d0412 100644 --- a/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.ts +++ b/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.ts @@ -123,6 +123,9 @@ export class AgentInformationComponent implements OnInit { this.orb.refreshNow(); this.toggleEdit(false); this.isRequesting = false; + }, + (error) => { + this.isRequesting = false; }); } diff --git a/ui/src/app/shared/components/orb/policy/policy-groups/policy-groups.component.scss b/ui/src/app/shared/components/orb/policy/policy-groups/policy-groups.component.scss index 28d543bad..c6572a462 100644 --- a/ui/src/app/shared/components/orb/policy/policy-groups/policy-groups.component.scss +++ b/ui/src/app/shared/components/orb/policy/policy-groups/policy-groups.component.scss @@ -170,6 +170,7 @@ nb-card { border: none !important; border-radius: 8px !important; padding: 0.1rem 0 !important; + background-color: transparent !important; } > nb-accordion-item-body { diff --git a/ui/src/app/shared/components/orb/policy/policy-interface/policy-interface.component.scss b/ui/src/app/shared/components/orb/policy/policy-interface/policy-interface.component.scss index 9090a1259..96cac03f9 100644 --- a/ui/src/app/shared/components/orb/policy/policy-interface/policy-interface.component.scss +++ b/ui/src/app/shared/components/orb/policy/policy-interface/policy-interface.component.scss @@ -70,7 +70,7 @@ nb-card { .code-editor-wrapper { min-height: 350px; min-width: 200px; - height: calc(50vh); + height: calc(45vh); width: calc(100%); display: block; } From 1be66c0f2ea376db2d7e08ece55fef865224ac97 Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Mon, 25 Sep 2023 13:01:31 -0300 Subject: [PATCH 82/83] fix(orb-ui): V1 Policy View new layout (#2646) --- ui/src/app/@theme/styles/_overrides.scss | 1 - .../view/agent.policy.view.component.html | 10 +++++----- .../pages/fleet/agents/view/agent.view.component.html | 4 ++-- .../pages/fleet/agents/view/agent.view.component.scss | 1 + .../agent/agent-backends/agent-backends.component.scss | 1 + .../agent-capabilities.component.scss | 1 + .../orb/agent/agent-groups/agent-groups.component.scss | 1 + .../agent-information/agent-information.component.scss | 1 + .../agent-policies-datasets.component.scss | 1 + .../agent-provisioning.component.scss | 1 + .../policy-datasets/policy-datasets.component.scss | 1 + .../policy-details/policy-details.component.html | 6 ++++-- .../policy-details/policy-details.component.scss | 8 +++++++- .../policy/policy-groups/policy-groups.component.scss | 2 +- .../policy-interface/policy-interface.component.scss | 4 ++-- 15 files changed, 29 insertions(+), 14 deletions(-) diff --git a/ui/src/app/@theme/styles/_overrides.scss b/ui/src/app/@theme/styles/_overrides.scss index c30ad1293..c84abfb0e 100644 --- a/ui/src/app/@theme/styles/_overrides.scss +++ b/ui/src/app/@theme/styles/_overrides.scss @@ -94,7 +94,6 @@ } nb-card { - border: none; /* width */ ::-webkit-scrollbar { width: 4px; diff --git a/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.html b/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.html index 4ba6ca33d..aae188a96 100644 --- a/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.html +++ b/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.html @@ -12,15 +12,15 @@

Policy View

-
+
Policy View >
-
+
-
+
-
+
Name

{{ policy?.name }}

-
+
-

{{ policy?.description }}

+

{{ policy?.description }}

+

No description provided

@@ -100,4 +101,5 @@ +
diff --git a/ui/src/app/shared/components/orb/policy/policy-details/policy-details.component.scss b/ui/src/app/shared/components/orb/policy/policy-details/policy-details.component.scss index 1c7fd3ae2..970f42bad 100644 --- a/ui/src/app/shared/components/orb/policy/policy-details/policy-details.component.scss +++ b/ui/src/app/shared/components/orb/policy/policy-details/policy-details.component.scss @@ -1,6 +1,7 @@ nb-card { border: transparent; border-radius: 0.5rem; + padding: 0 !important; nb-card-header { background-color: #232940; @@ -11,6 +12,7 @@ nb-card { } nb-card-body { + padding-bottom: 0 !important; label { color: #969fb9; } @@ -27,7 +29,11 @@ nb-card { } } } - +.italic { + font-style: italic; + font-size: 0.9rem; + color: #d9deee; +} .summary-accent { color: #969fb9 !important; } diff --git a/ui/src/app/shared/components/orb/policy/policy-groups/policy-groups.component.scss b/ui/src/app/shared/components/orb/policy/policy-groups/policy-groups.component.scss index c6572a462..752cd7091 100644 --- a/ui/src/app/shared/components/orb/policy/policy-groups/policy-groups.component.scss +++ b/ui/src/app/shared/components/orb/policy/policy-groups/policy-groups.component.scss @@ -14,7 +14,7 @@ button { nb-card { border: transparent; border-radius: 0.5rem; - + padding: 0 !important; nb-card-header { background-color: #232940; border-bottom: transparent; diff --git a/ui/src/app/shared/components/orb/policy/policy-interface/policy-interface.component.scss b/ui/src/app/shared/components/orb/policy/policy-interface/policy-interface.component.scss index 96cac03f9..e21374c8b 100644 --- a/ui/src/app/shared/components/orb/policy/policy-interface/policy-interface.component.scss +++ b/ui/src/app/shared/components/orb/policy/policy-interface/policy-interface.component.scss @@ -1,7 +1,7 @@ nb-card { border: transparent; border-radius: 0.5rem; - + padding: 0 !important; nb-card-header { background-color: #232940; border-bottom: transparent; @@ -70,7 +70,7 @@ nb-card { .code-editor-wrapper { min-height: 350px; min-width: 200px; - height: calc(45vh); + height: 367px; width: calc(100%); display: block; } From 98d328b82fa817d8a8f7b8382590b43a8cf4a758 Mon Sep 17 00:00:00 2001 From: joaoguilherme2003 Date: Mon, 25 Sep 2023 16:10:27 -0300 Subject: [PATCH 83/83] improvement(orb-ui): #1191 Delete Selected Modal (#2649) * improvement(orb-ui): #1191 Delete Selected Modal * policy duplicate style --- ui/src/app/@theme/styles/_overrides.scss | 4 +- .../delete/dataset.delete.component.scss | 5 ++ .../delete/agent.policy.delete.component.scss | 5 ++ .../agent.policy.duplicate.confirmation.scss | 5 ++ .../agents/delete/agent.delete.component.scss | 5 ++ .../fleet/agents/list/agent.list.component.ts | 4 +- .../agents/reset/agent.reset.component.html | 20 +++++-- .../agents/reset/agent.reset.component.scss | 43 +++++++++++++- .../agents/reset/agent.reset.component.ts | 4 +- .../delete/agent.group.delete.component.scss | 6 +- .../groups/list/agent.group.list.component.ts | 12 +--- .../sinks/delete/sink.delete.component.scss | 5 ++ .../delete/delete.selected.component.html | 39 ++++++++---- .../delete/delete.selected.component.scss | 59 +++++++++++++++++++ .../delete/delete.selected.component.ts | 13 +++- 15 files changed, 191 insertions(+), 38 deletions(-) diff --git a/ui/src/app/@theme/styles/_overrides.scss b/ui/src/app/@theme/styles/_overrides.scss index c84abfb0e..2b3e408b5 100644 --- a/ui/src/app/@theme/styles/_overrides.scss +++ b/ui/src/app/@theme/styles/_overrides.scss @@ -280,9 +280,7 @@ p { font-family: 'Montserrat' !important; } -button { - font-family: 'Montserrat' !important; -} + label { font-family: 'Montserrat' !important; } diff --git a/ui/src/app/pages/datasets/delete/dataset.delete.component.scss b/ui/src/app/pages/datasets/delete/dataset.delete.component.scss index ecb4178c6..6bf6eb96a 100644 --- a/ui/src/app/pages/datasets/delete/dataset.delete.component.scss +++ b/ui/src/app/pages/datasets/delete/dataset.delete.component.scss @@ -1,5 +1,6 @@ nb-card { max-width: 38rem !important; + padding: 0 !important; nb-card-header { background: #232940 !important; @@ -12,6 +13,10 @@ nb-card { p { color: #969fb9 !important; + margin-bottom: 1rem !important; + font-weight: 500 !important; + font-size: 14px !important; + line-height: 24px !important; } .ns1-red { diff --git a/ui/src/app/pages/datasets/policies.agent/delete/agent.policy.delete.component.scss b/ui/src/app/pages/datasets/policies.agent/delete/agent.policy.delete.component.scss index 458a0d644..33f8c6453 100644 --- a/ui/src/app/pages/datasets/policies.agent/delete/agent.policy.delete.component.scss +++ b/ui/src/app/pages/datasets/policies.agent/delete/agent.policy.delete.component.scss @@ -1,5 +1,6 @@ nb-card { max-width: 38rem !important; + padding: 0 !important; nb-card-header { background: #232940 !important; @@ -12,6 +13,10 @@ nb-card { p { color: #969fb9 !important; + margin-bottom: 1rem !important; + font-weight: 500 !important; + font-size: 14px !important; + line-height: 24px !important; } .ns1-red { diff --git a/ui/src/app/pages/datasets/policies.agent/duplicate/agent.policy.duplicate.confirmation.scss b/ui/src/app/pages/datasets/policies.agent/duplicate/agent.policy.duplicate.confirmation.scss index 9b2c47f2a..87db6a24b 100644 --- a/ui/src/app/pages/datasets/policies.agent/duplicate/agent.policy.duplicate.confirmation.scss +++ b/ui/src/app/pages/datasets/policies.agent/duplicate/agent.policy.duplicate.confirmation.scss @@ -1,5 +1,6 @@ nb-card { max-width: 38rem !important; + padding: 0 !important; nb-card-header { background: #232940 !important; @@ -12,6 +13,10 @@ nb-card { p { color: #969fb9 !important; + margin-bottom: 1rem !important; + font-weight: 500 !important; + font-size: 14px !important; + line-height: 24px !important; } .ns1-red { diff --git a/ui/src/app/pages/fleet/agents/delete/agent.delete.component.scss b/ui/src/app/pages/fleet/agents/delete/agent.delete.component.scss index 8ac634efb..003444e84 100644 --- a/ui/src/app/pages/fleet/agents/delete/agent.delete.component.scss +++ b/ui/src/app/pages/fleet/agents/delete/agent.delete.component.scss @@ -1,5 +1,6 @@ nb-card { max-width: 38rem !important; + padding: 0 !important; nb-card-header { background: #232940 !important; @@ -12,6 +13,10 @@ nb-card { p { color: #969fb9 !important; + margin-bottom: 1rem !important; + font-weight: 500 !important; + font-size: 14px !important; + line-height: 24px !important; } .ns1-red { diff --git a/ui/src/app/pages/fleet/agents/list/agent.list.component.ts b/ui/src/app/pages/fleet/agents/list/agent.list.component.ts index 702b66eaf..ffa64ffc0 100644 --- a/ui/src/app/pages/fleet/agents/list/agent.list.component.ts +++ b/ui/src/app/pages/fleet/agents/list/agent.list.component.ts @@ -373,10 +373,10 @@ export class AgentListComponent implements AfterViewInit, AfterViewChecked, OnDe } onOpenResetAgents() { - const size = this.selected.length; + const selected = this.selected; this.dialogService .open(AgentResetComponent, { - context: { size }, + context: { selected }, autoFocus: true, closeOnEsc: true, }) diff --git a/ui/src/app/pages/fleet/agents/reset/agent.reset.component.html b/ui/src/app/pages/fleet/agents/reset/agent.reset.component.html index 6a7488242..d2096fcdf 100644 --- a/ui/src/app/pages/fleet/agents/reset/agent.reset.component.html +++ b/ui/src/app/pages/fleet/agents/reset/agent.reset.component.html @@ -11,17 +11,27 @@ -

Are you sure you want to reset a total of {{ size }} Agents?

-

*To confirm, type the amount of agents to be reset.

+

Are you sure you want to reset a total of {{ selected.length }} Agent(s)?

+
+
+
+ {{ item.name }} +
+
+ {{ item.state | titlecase }} +
+
+
+

*To confirm, type the amount of agents to be reset.

+ placeholder="{{selected.length}}" [(ngModel)]="validationInput" + data-orb-qa-id="input#selected.length"> - {{size}} + {{selected.length}} diff --git a/ui/src/app/pages/fleet/agents/reset/agent.reset.component.scss b/ui/src/app/pages/fleet/agents/reset/agent.reset.component.scss index 4f28bb2d8..8c53dbf85 100644 --- a/ui/src/app/pages/fleet/agents/reset/agent.reset.component.scss +++ b/ui/src/app/pages/fleet/agents/reset/agent.reset.component.scss @@ -1,5 +1,6 @@ nb-card { max-width: 38rem !important; + padding: 0 !important; nb-card-header { background: #232940 !important; @@ -12,6 +13,10 @@ nb-card { p { color: #969fb9 !important; + margin-bottom: 1rem !important; + font-weight: 500 !important; + font-size: 14px !important; + line-height: 24px !important; } .ns1-red { @@ -48,4 +53,40 @@ nb-card { } .ns1red { color: #df316f !important; - } \ No newline at end of file + } + .element-list { + max-height: 225px; + overflow-y: auto; + margin-left: 20px; + } + .span-accent { + font-size: 13px; + font-weight: 600; + float: right; + } + .item-row { + display: flex; + align-items: center; + border-radius: 6px; + width: 300px; + padding-left: 3px; + font-size: 13px; + font-weight: 600; + } + .item-row:hover { + background-color: #1e263d; + } + .col-8 { + flex: 1; + padding-left: 0; + } + .col-3 { + flex: 1; + padding-right: 0; + } + .overflow-ellipsis { + white-space: nowrap !important; + overflow: hidden !important; + text-overflow: ellipsis !important; + max-width: 350px !important; + } diff --git a/ui/src/app/pages/fleet/agents/reset/agent.reset.component.ts b/ui/src/app/pages/fleet/agents/reset/agent.reset.component.ts index 59ec7a923..5f8180a4f 100644 --- a/ui/src/app/pages/fleet/agents/reset/agent.reset.component.ts +++ b/ui/src/app/pages/fleet/agents/reset/agent.reset.component.ts @@ -10,7 +10,7 @@ import { STRINGS } from 'assets/text/strings'; export class AgentResetComponent { strings = STRINGS.agents; - @Input() size: Number; + @Input() selected: any[] = []; validationInput: Number; @@ -28,6 +28,6 @@ export class AgentResetComponent { } isEnabled(): boolean { - return this.validationInput === this.size; + return this.validationInput === this.selected.length; } } \ No newline at end of file diff --git a/ui/src/app/pages/fleet/groups/delete/agent.group.delete.component.scss b/ui/src/app/pages/fleet/groups/delete/agent.group.delete.component.scss index 8ac634efb..ab675c0a8 100644 --- a/ui/src/app/pages/fleet/groups/delete/agent.group.delete.component.scss +++ b/ui/src/app/pages/fleet/groups/delete/agent.group.delete.component.scss @@ -1,6 +1,6 @@ nb-card { max-width: 38rem !important; - + padding: 0 !important; nb-card-header { background: #232940 !important; color: #969fb9 !important; @@ -12,6 +12,10 @@ nb-card { p { color: #969fb9 !important; + margin-bottom: 1rem !important; + font-weight: 500 !important; + font-size: 14px !important; + line-height: 24px !important; } .ns1-red { diff --git a/ui/src/app/pages/fleet/groups/list/agent.group.list.component.ts b/ui/src/app/pages/fleet/groups/list/agent.group.list.component.ts index 9009c7a39..4e20d6b83 100644 --- a/ui/src/app/pages/fleet/groups/list/agent.group.list.component.ts +++ b/ui/src/app/pages/fleet/groups/list/agent.group.list.component.ts @@ -309,12 +309,8 @@ export class AgentGroupListComponent }); } public onCheckboxChange(event: any, row: any): void { - let selectedGroup = { - id: row.id, - name: row.name, - } if (this.getChecked(row) === false) { - this.selected.push(selectedGroup); + this.selected.push(row); } else { for (let i = 0; i < this.selected.length; i++) { @@ -336,11 +332,7 @@ export class AgentGroupListComponent this.groupsSubscription = this.filteredGroups$.subscribe(rows => { this.selected = []; rows.forEach(row => { - const policySelected = { - id: row.id, - name: row.name, - } - this.selected.push(policySelected); + this.selected.push(row); }); }); } else { diff --git a/ui/src/app/pages/sinks/delete/sink.delete.component.scss b/ui/src/app/pages/sinks/delete/sink.delete.component.scss index 8ac634efb..003444e84 100644 --- a/ui/src/app/pages/sinks/delete/sink.delete.component.scss +++ b/ui/src/app/pages/sinks/delete/sink.delete.component.scss @@ -1,5 +1,6 @@ nb-card { max-width: 38rem !important; + padding: 0 !important; nb-card-header { background: #232940 !important; @@ -12,6 +13,10 @@ nb-card { p { color: #969fb9 !important; + margin-bottom: 1rem !important; + font-weight: 500 !important; + font-size: 14px !important; + line-height: 24px !important; } .ns1-red { diff --git a/ui/src/app/shared/components/delete/delete.selected.component.html b/ui/src/app/shared/components/delete/delete.selected.component.html index a068e1781..01db8514b 100644 --- a/ui/src/app/shared/components/delete/delete.selected.component.html +++ b/ui/src/app/shared/components/delete/delete.selected.component.html @@ -11,19 +11,34 @@

Are you sure you want to delete a total of {{ selected?.length }} {{ elementName }}? This action cannot be undone.

-
- {{ item.name }} {{ item.state | titlecase }} {{ item.usage | titlecase }} +
+
+
+ {{ item.name }} +
+
+ {{ item.state | titlecase }} + {{ item.usage | titlecase }} + +
+
+
+
+

*To confirm, type the amount of {{ elementName }} to be delete.

+ + + {{selected?.length}} +
-

*To confirm, type the amount of {{ elementName }} to be delete.

- - - {{selected?.length}} -