Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
e3c6feb
Make `UsageReporter` reusable, move it to the new package
gzdunek Dec 14, 2022
0a2d5b7
Add `TeleportUsageReporter`
gzdunek Dec 14, 2022
ff71bb7
Rename `UsageSubmitFunc` and `SubmitAnonymizedUsageEvents`
gzdunek Dec 21, 2022
3325ff8
Rename `NewUsageReporterTeleport` to `NewTeleportUsageReporter`
gzdunek Dec 21, 2022
aaa43c8
Merge branch 'master' into gzdunek/make-usage-reporter-reusable
gzdunek Dec 29, 2022
4c1febe
Remove timestamp from test
gzdunek Dec 29, 2022
474f608
Update e-ref
gzdunek Dec 29, 2022
9cbcc4a
Fix imports
gzdunek Dec 29, 2022
7273198
Rename receivers
gzdunek Dec 30, 2022
8a35ae7
Add comment
gzdunek Dec 30, 2022
c94e8f4
Merge branch 'master' into gzdunek/make-usage-reporter-reusable
gzdunek Dec 30, 2022
04be558
Bring back original `MaxBatchAge` in tests
gzdunek Dec 30, 2022
e6f2fb8
Report Connect usage events
gzdunek Dec 21, 2022
909bacf
Fix comment for retryAttempts
gzdunek Dec 30, 2022
00769c1
Remove tshd usage events, opearate only on prehog protos
gzdunek Dec 30, 2022
a823e30
Change `prehog_event` to `prehog_req`
gzdunek Jan 3, 2023
0535122
Merge branch 'master' into gzdunek/add-usage-reporter-to-connect
gzdunek Jan 3, 2023
d6fdd20
Populate failed events array
gzdunek Jan 3, 2023
ffde8ca
Rename things a little
gzdunek Jan 3, 2023
de1816c
Fix lint issues
gzdunek Jan 3, 2023
54a12ce
Rename `ReportEvent` to `ReportUsageEvent` in gRPC service for better…
gzdunek Jan 3, 2023
f24135a
Do not check license in generated prehog js files
gzdunek Jan 3, 2023
c7b59a0
Update protos
gzdunek Jan 3, 2023
9d85079
Merge branch 'master' into gzdunek/add-usage-reporter-to-connect
gzdunek Jan 4, 2023
c25f258
Merge branch 'master' into gzdunek/add-usage-reporter-to-connect
gzdunek Jan 9, 2023
80cee73
Merge branch 'master' into gzdunek/add-usage-reporter-to-connect
gzdunek Jan 10, 2023
9e971ed
Update Connect proto files to match prehog
gzdunek Jan 10, 2023
1906460
Generate JS files for prehog protos
gzdunek Jan 10, 2023
5466f3c
Pass prehog address as argument to tshd process instead of hard-codin…
gzdunek Jan 10, 2023
6bcfaeb
Keep `DaemonPrehogAddr` with other prehog values
gzdunek Jan 10, 2023
464588d
Merge branch 'master' into gzdunek/add-usage-reporter-to-connect
gzdunek Jan 10, 2023
012201f
Merge branch 'master' into gzdunek/add-usage-reporter-to-connect
gzdunek Jan 10, 2023
e45fb3b
Merge branch 'master' into gzdunek/add-usage-reporter-to-connect
gzdunek Jan 10, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -848,6 +848,7 @@ ADDLICENSE_ARGS := -c 'Gravitational, Inc' -l apache \
-ignore 'lib/srv/desktop/rdp/rdpclient/target/**' \
-ignore 'lib/teleterm/api/protogen/**' \
-ignore 'lib/prehog/gen/**' \
-ignore 'lib/prehog/gen-js/**' \
-ignore 'lib/web/build/**' \
-ignore 'version.go' \
-ignore 'webassets/**' \
Expand Down Expand Up @@ -1039,6 +1040,7 @@ grpc-teleterm:
# Unlike grpc-teleterm, this target runs locally.
.PHONY: grpc-teleterm/host
grpc-teleterm/host: protos/all
$(BUF) generate --template=lib/prehog/buf-teleterm.gen.yaml lib/prehog/proto
$(BUF) generate --template=lib/teleterm/buf.gen.yaml lib/teleterm/api/proto

.PHONY: goinstall
Expand Down
30 changes: 30 additions & 0 deletions lib/prehog/buf-teleterm.gen.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# buf-teleterm.gen.yaml is identical to buf.gen.yaml,
# with the exception of three additional JS plugins.
version: v1
managed:
enabled: true
go_package_prefix:
default: github.com/gravitational/teleport/lib/prehog/gen
plugins:
- name: go
path: lib/prehog/bin/protoc-gen-go
out: lib/prehog/gen
opt:
- paths=source_relative
- name: connect-go
path: lib/prehog/bin/protoc-gen-connect-go
out: lib/prehog/gen
opt:
- paths=source_relative

- name: js
out: lib/prehog/gen-js
opt:
- import_style=commonjs,binary
- name: grpc
out: lib/prehog/gen-js
opt: grpc_js
path: grpc_tools_node_protoc_plugin
- name: ts
out: lib/prehog/gen-js
opt: "service=grpc-node"
42 changes: 42 additions & 0 deletions lib/prehog/gen-js/prehog/v1alpha/connect_grpc_pb.d.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

60 changes: 60 additions & 0 deletions lib/prehog/gen-js/prehog/v1alpha/connect_grpc_pb.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading