luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity
open-consul/agent/consul/usagemetrics/usagemetrics_oss_test.go

1356 lines
49 KiB
Go
Raw Normal View History

re-run gofmt on 1.17 (#11579) This should let freshly recompiled golangci-lint binaries using Go 1.17 pass 'make lint'
2021-11-16 18:04:01 +00:00
//go:build !consulent
Report node/service usage metrics from every server Using the newly provided state store methods, we periodically emit usage metrics from the servers. We decided to emit these metrics from all servers, not just the leader, because that means we do not have to care about leader election flapping causing metrics turbulence, and it seems reasonable for each server to emit its own view of the state, even if they should always converge rapidly.
2020-09-02 15:24:17 +00:00
// +build !consulent
package usagemetrics
Emit service usage metrics with correct labeling strategy (#8856) Previously, we would emit service usage metrics both with and without a namespace label attached. This is problematic in the case when you want to aggregate metrics together, i.e. "sum(consul.state.services)". This would cause services to be counted twice in that aggregate, once via the metric emitted with a namespace label, and once in the metric emited without any namespace label.
2020-10-09 16:01:45 +00:00
import (
"testing"
"time"
"github.com/armon/go-metrics"
state: partition the usage metrics subsystem (#10867)
2021-08-18 14:27:15 +00:00
"github.com/hashicorp/serf/serf"
Add peer counts to emitted metrics. (#13930)
2022-07-27 22:34:04 +00:00
"github.com/stretchr/testify/require"
state: partition the usage metrics subsystem (#10867)
2021-08-18 14:27:15 +00:00
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
"github.com/hashicorp/go-uuid"
Fixup acl.EnterpriseMeta Signed-off-by: Mark Anderson <manderson@hashicorp.com>
2022-04-05 21:10:06 +00:00
"github.com/hashicorp/consul/acl"
Emit service usage metrics with correct labeling strategy (#8856) Previously, we would emit service usage metrics both with and without a namespace label attached. This is problematic in the case when you want to aggregate metrics together, i.e. "sum(consul.state.services)". This would cause services to be counted twice in that aggregate, once via the metric emitted with a namespace label, and once in the metric emited without any namespace label.
2020-10-09 16:01:45 +00:00
"github.com/hashicorp/consul/agent/consul/state"
"github.com/hashicorp/consul/agent/structs"
Protobuf Refactoring for Multi-Module Cleanliness (#16302) Protobuf Refactoring for Multi-Module Cleanliness This commit includes the following: Moves all packages that were within proto/ to proto/private Rewrites imports to account for the packages being moved Adds in buf.work.yaml to enable buf workspaces Names the proto-public buf module so that we can override the Go package imports within proto/buf.yaml Bumps the buf version dependency to 1.14.0 (I was trying out the version to see if it would get around an issue - it didn't but it also doesn't break things and it seemed best to keep up with the toolchain changes) Why: In the future we will need to consume other protobuf dependencies such as the Google HTTP annotations for openapi generation or grpc-gateway usage. There were some recent changes to have our own ratelimiting annotations. The two combined were not working when I was trying to use them together (attempting to rebase another branch) Buf workspaces should be the solution to the problem Buf workspaces means that each module will have generated Go code that embeds proto file names relative to the proto dir and not the top level repo root. This resulted in proto file name conflicts in the Go global protobuf type registry. The solution to that was to add in a private/ directory into the path within the proto/ directory. That then required rewriting all the imports. Is this safe? AFAICT yes The gRPC wire protocol doesn't seem to care about the proto file names (although the Go grpc code does tack on the proto file name as Metadata in the ServiceDesc) Other than imports, there were no changes to any generated code as a result of this.
2023-02-17 21:14:46 +00:00
"github.com/hashicorp/consul/proto/private/pbpeering"
Emit service usage metrics with correct labeling strategy (#8856) Previously, we would emit service usage metrics both with and without a namespace label attached. This is problematic in the case when you want to aggregate metrics together, i.e. "sum(consul.state.services)". This would cause services to be counted twice in that aggregate, once via the metric emitted with a namespace label, and once in the metric emited without any namespace label.
2020-10-09 16:01:45 +00:00
"github.com/hashicorp/consul/sdk/testutil"
)
Report node/service usage metrics from every server Using the newly provided state store methods, we periodically emit usage metrics from the servers. We decided to emit these metrics from all servers, not just the leader, because that means we do not have to care about leader election flapping causing metrics turbulence, and it seems reasonable for each server to emit its own view of the state, even if they should always converge rapidly.
2020-09-02 15:24:17 +00:00
restore prior signature of test helper so enterprise compiles
2020-10-29 18:52:15 +00:00
func newStateStore() (*state.Store, error) {
return state.NewStateStore(nil), nil
Report node/service usage metrics from every server Using the newly provided state store methods, we periodically emit usage metrics from the servers. We decided to emit these metrics from all servers, not just the leader, because that means we do not have to care about leader election flapping causing metrics turbulence, and it seems reasonable for each server to emit its own view of the state, even if they should always converge rapidly.
2020-09-02 15:24:17 +00:00
}
Emit service usage metrics with correct labeling strategy (#8856) Previously, we would emit service usage metrics both with and without a namespace label attached. This is problematic in the case when you want to aggregate metrics together, i.e. "sum(consul.state.services)". This would cause services to be counted twice in that aggregate, once via the metric emitted with a namespace label, and once in the metric emited without any namespace label.
2020-10-09 16:01:45 +00:00
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
type testCase struct {
modfiyStateStore func(t *testing.T, s *state.Store)
getMembersFunc getMembersFunc
expectedGauges map[string]metrics.GaugeValue
}
var baseCases = map[string]testCase{
"empty-state": {
expectedGauges: map[string]metrics.GaugeValue{
// --- node ---
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.consul.state.nodes;datacenter=dc1": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.nodes",
Value: 0,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.nodes;datacenter=dc1": {
Name: "consul.usage.test.state.nodes",
Value: 0,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
// --- peering ---
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.consul.state.peerings;datacenter=dc1": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.peerings",
Value: 0,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.peerings;datacenter=dc1": {
Name: "consul.usage.test.state.peerings",
Value: 0,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
// --- member ---
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.consul.members.clients;datacenter=dc1": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.members.clients",
Value: 0,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.members.clients;datacenter=dc1": {
Name: "consul.usage.test.members.clients",
Value: 0,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
},
"consul.usage.test.consul.members.servers;datacenter=dc1": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.members.servers",
Value: 0,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.members.servers;datacenter=dc1": {
Name: "consul.usage.test.members.servers",
Value: 0,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
// --- service ---
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.consul.state.services;datacenter=dc1": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.services",
Value: 0,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.services;datacenter=dc1": {
Name: "consul.usage.test.state.services",
Value: 0,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
},
"consul.usage.test.consul.state.service_instances;datacenter=dc1": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.service_instances",
Value: 0,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.service_instances;datacenter=dc1": {
Name: "consul.usage.test.state.service_instances",
Value: 0,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
// --- service mesh ---
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.consul.state.connect_instances;datacenter=dc1;kind=connect-proxy": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.connect_instances",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "connect-proxy"},
Add metrics to count service mesh Kind instance counts This will add the counts of service mesh instances tagged by the different ServiceKind's.
2021-09-30 21:15:26 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.connect_instances;datacenter=dc1;kind=connect-proxy": {
Name: "consul.usage.test.state.connect_instances",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "connect-proxy"},
},
},
"consul.usage.test.consul.state.connect_instances;datacenter=dc1;kind=terminating-gateway": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.connect_instances",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "terminating-gateway"},
Add metrics to count service mesh Kind instance counts This will add the counts of service mesh instances tagged by the different ServiceKind's.
2021-09-30 21:15:26 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.connect_instances;datacenter=dc1;kind=terminating-gateway": {
Name: "consul.usage.test.state.connect_instances",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "terminating-gateway"},
},
},
"consul.usage.test.consul.state.connect_instances;datacenter=dc1;kind=ingress-gateway": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.connect_instances",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "ingress-gateway"},
Add metrics to count service mesh Kind instance counts This will add the counts of service mesh instances tagged by the different ServiceKind's.
2021-09-30 21:15:26 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.connect_instances;datacenter=dc1;kind=ingress-gateway": {
Name: "consul.usage.test.state.connect_instances",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "ingress-gateway"},
},
},
"consul.usage.test.consul.state.connect_instances;datacenter=dc1;kind=mesh-gateway": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.connect_instances",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "mesh-gateway"},
Add metrics to count connect native service mesh instances This will add the counts of the service mesh instances tagged by whether or not it is connect native
2021-09-30 21:48:21 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.connect_instances;datacenter=dc1;kind=mesh-gateway": {
Name: "consul.usage.test.state.connect_instances",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "mesh-gateway"},
},
},
"consul.usage.test.consul.state.connect_instances;datacenter=dc1;kind=connect-native": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.connect_instances",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "connect-native"},
Add KVUsage to consul state usage metrics This change will add the number of entries in the consul KV store to the already existing usage metrics.
2021-09-17 19:36:34 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.connect_instances;datacenter=dc1;kind=connect-native": {
Name: "consul.usage.test.state.connect_instances",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "connect-native"},
},
},
Add the `operator usage instances` command and api endpoint (#16205) This endpoint shows total services, connect service instances and billable service instances in the local datacenter or globally. Billable instances = total service instances - connect services - consul server instances.
2023-02-08 20:07:21 +00:00
"consul.usage.test.state.billable_service_instances;datacenter=dc1": {
Name: "consul.usage.test.state.billable_service_instances",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
},
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
// --- kv ---
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.consul.state.kv_entries;datacenter=dc1": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.kv_entries",
Value: 0,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.kv_entries;datacenter=dc1": {
Name: "consul.usage.test.state.kv_entries",
Value: 0,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
// --- config entries ---
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=service-intentions": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "service-intentions"},
Add metrics to count the number of service-mesh config entries
2021-10-01 18:22:30 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.config_entries;datacenter=dc1;kind=service-intentions": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "service-intentions"},
},
},
"consul.usage.test.state.config_entries;datacenter=dc1;kind=service-resolver": { // Legacy
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "service-resolver"},
},
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=service-resolver": {
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "service-resolver"},
Add metrics to count the number of service-mesh config entries
2021-10-01 18:22:30 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=service-router": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "service-router"},
Add metrics to count the number of service-mesh config entries
2021-10-01 18:22:30 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.config_entries;datacenter=dc1;kind=service-router": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "service-router"},
},
},
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=service-defaults": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "service-defaults"},
Add metrics to count the number of service-mesh config entries
2021-10-01 18:22:30 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.config_entries;datacenter=dc1;kind=service-defaults": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "service-defaults"},
},
},
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=ingress-gateway": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "ingress-gateway"},
Add metrics to count the number of service-mesh config entries
2021-10-01 18:22:30 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.config_entries;datacenter=dc1;kind=ingress-gateway": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "ingress-gateway"},
},
},
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=service-splitter": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "service-splitter"},
Add metrics to count the number of service-mesh config entries
2021-10-01 18:22:30 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.config_entries;datacenter=dc1;kind=service-splitter": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "service-splitter"},
},
},
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=mesh": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "mesh"},
Add metrics to count the number of service-mesh config entries
2021-10-01 18:22:30 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.config_entries;datacenter=dc1;kind=mesh": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "mesh"},
},
},
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=proxy-defaults": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "proxy-defaults"},
Add metrics to count the number of service-mesh config entries
2021-10-01 18:22:30 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.config_entries;datacenter=dc1;kind=proxy-defaults": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "proxy-defaults"},
},
},
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=terminating-gateway": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "terminating-gateway"},
Add metrics to count the number of service-mesh config entries
2021-10-01 18:22:30 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.config_entries;datacenter=dc1;kind=terminating-gateway": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "terminating-gateway"},
},
},
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=exported-services": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "exported-services"},
Add new service-exports config entry
2021-10-20 19:24:18 +00:00
},
state: partition the usage metrics subsystem (#10867)
2021-08-18 14:27:15 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.config_entries;datacenter=dc1;kind=exported-services": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "exported-services"},
},
},
Add sameness-group configuration entry. (#16608) This commit adds a sameness-group config entry to the API and structs packages. It includes some validation logic and a new memdb index that tracks the default sameness-group for each partition. Sameness groups will simplify the effort of managing failovers / intentions / exports for peers and partitions. Note that this change purely to introduce the configuration entry and does not include the full functionality of sameness-groups.
2023-03-13 21:19:11 +00:00
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=sameness-group": { // Legacy
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "sameness-group"},
},
},
"consul.usage.test.state.config_entries;datacenter=dc1;kind=sameness-group": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "sameness-group"},
},
},
Native API Gateway Config Entries (#15897) * Stub Config Entries for Consul Native API Gateway (#15644) * Add empty InlineCertificate struct and protobuf * apigateway stubs * Stub HTTPRoute in api pkg * Stub HTTPRoute in structs pkg * Simplify api.APIGatewayConfigEntry to be consistent w/ other entries * Update makeConfigEntry switch, add docstring for HTTPRouteConfigEntry * Add TCPRoute to MakeConfigEntry, return unique Kind * Stub BoundAPIGatewayConfigEntry in agent * Add RaftIndex to APIGatewayConfigEntry stub * Add new config entry kinds to validation allow-list * Add RaftIndex to other added config entry stubs * Update usage metrics assertions to include new cfg entries * Add Meta and acl.EnterpriseMeta to all new ConfigEntry types * Remove unnecessary Services field from added config entry types * Implement GetMeta(), GetEnterpriseMeta() for added config entry types * Add meta field to proto, name consistently w/ existing config entries * Format config_entry.proto * Add initial implementation of CanRead + CanWrite for new config entry types * Add unit tests for decoding of new config entry types * Add unit tests for parsing of new config entry types * Add unit tests for API Gateway config entry ACLs * Return typed PermissionDeniedError on BoundAPIGateway CanWrite * Add unit tests for added config entry ACLs * Add BoundAPIGateway type to AllConfigEntryKinds * Return proper kind from BoundAPIGateway * Add docstrings for new config entry types * Add missing config entry kinds to proto def * Update usagemetrics_oss_test.go * Use utility func for returning PermissionDeniedError * EventPublisher subscriptions for Consul Native API Gateway (#15757) * Create new event topics in subscribe proto * Add tests for PBSubscribe func * Make configs singular, add all configs to PBToStreamSubscribeRequest * Add snapshot methods * Add config_entry_events tests * Add config entry kind to topic for new configs * Add unit tests for snapshot methods * Start adding integration test * Test using the new controller code * Update agent/consul/state/config_entry_events.go * Check value of error * Add controller stubs for API Gateway (#15837) * update initial stub implementation * move files, clean up mutex references * Remove embed, use idiomatic names for constructors * Remove stray file introduced in merge * Add APIGateway validation (#15847) * Add APIGateway validation * Add additional validations * Add cert ref validation * Add protobuf definitions * Fix up field types * Add API structs * Move struct fields around a bit * APIGateway InlineCertificate validation (#15856) * Add APIGateway validation * Add additional validations * Add protobuf definitions * Tabs to spaces * Add API structs * Move struct fields around a bit * Add validation for InlineCertificate * Fix ACL test * APIGateway BoundAPIGateway validation (#15858) * Add APIGateway validation * Add additional validations * Add cert ref validation * Add protobuf definitions * Fix up field types * Add API structs * Move struct fields around a bit * Add validation for BoundAPIGateway * APIGateway TCPRoute validation (#15855) * Add APIGateway validation * Add additional validations * Add cert ref validation * Add protobuf definitions * Fix up field types * Add API structs * Add TCPRoute normalization and validation * Add forgotten Status * Add some more field docs in api package * Fix test * Format imports * Rename snapshot test variable names * Add plumbing for Native API GW Subscriptions (#16003) Co-authored-by: Sarah Alsmiller <sarah.alsmiller@hashicorp.com> Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com> Co-authored-by: sarahalsmiller <100602640+sarahalsmiller@users.noreply.github.com> Co-authored-by: Andrew Stucki <andrew.stucki@hashicorp.com>
2023-01-18 22:14:34 +00:00
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=api-gateway": { // Legacy
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "api-gateway"},
},
},
"consul.usage.test.state.config_entries;datacenter=dc1;kind=api-gateway": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "api-gateway"},
},
},
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=bound-api-gateway": { // Legacy
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "bound-api-gateway"},
},
},
"consul.usage.test.state.config_entries;datacenter=dc1;kind=bound-api-gateway": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "bound-api-gateway"},
},
},
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=inline-certificate": { // Legacy
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "inline-certificate"},
},
},
"consul.usage.test.state.config_entries;datacenter=dc1;kind=inline-certificate": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "inline-certificate"},
},
},
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=http-route": { // Legacy
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "http-route"},
},
},
"consul.usage.test.state.config_entries;datacenter=dc1;kind=http-route": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "http-route"},
},
},
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=tcp-route": { // Legacy
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "tcp-route"},
},
},
"consul.usage.test.state.config_entries;datacenter=dc1;kind=tcp-route": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "tcp-route"},
},
},
state: partition the usage metrics subsystem (#10867)
2021-08-18 14:27:15 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
getMembersFunc: func() []serf.Member { return []serf.Member{} },
},
"nodes": {
modfiyStateStore: func(t *testing.T, s *state.Store) {
require.NoError(t, s.EnsureNode(1, &structs.Node{Node: "foo", Address: "127.0.0.1"}))
require.NoError(t, s.EnsureNode(2, &structs.Node{Node: "bar", Address: "127.0.0.2"}))
},
getMembersFunc: func() []serf.Member {
return []serf.Member{
{
Name: "foo",
Tags: map[string]string{"role": "consul"},
Status: serf.StatusAlive,
},
{
Name: "bar",
Tags: map[string]string{"role": "consul"},
Status: serf.StatusAlive,
},
}
},
expectedGauges: map[string]metrics.GaugeValue{
// --- node ---
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.consul.state.nodes;datacenter=dc1": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.nodes",
Value: 2,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
state: partition the usage metrics subsystem (#10867)
2021-08-18 14:27:15 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.nodes;datacenter=dc1": {
Name: "consul.usage.test.state.nodes",
Value: 2,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
// --- peering ---
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.consul.state.peerings;datacenter=dc1": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.peerings",
Value: 0,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
state: partition the usage metrics subsystem (#10867)
2021-08-18 14:27:15 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.peerings;datacenter=dc1": {
Name: "consul.usage.test.state.peerings",
Value: 0,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
// --- member ---
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.consul.members.servers;datacenter=dc1": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.members.servers",
Value: 2,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.members.servers;datacenter=dc1": {
Name: "consul.usage.test.members.servers",
Value: 2,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
},
"consul.usage.test.consul.members.clients;datacenter=dc1": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.members.clients",
Value: 0,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.members.clients;datacenter=dc1": {
Name: "consul.usage.test.members.clients",
Value: 0,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
// --- service ---
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.consul.state.services;datacenter=dc1": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.services",
Value: 0,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.services;datacenter=dc1": {
Name: "consul.usage.test.state.services",
Value: 0,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
},
"consul.usage.test.consul.state.service_instances;datacenter=dc1": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.service_instances",
Value: 0,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.service_instances;datacenter=dc1": {
Name: "consul.usage.test.state.service_instances",
Value: 0,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
// --- service mesh ---
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.consul.state.connect_instances;datacenter=dc1;kind=connect-proxy": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.connect_instances",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "connect-proxy"},
Add metrics to count service mesh Kind instance counts This will add the counts of service mesh instances tagged by the different ServiceKind's.
2021-09-30 21:15:26 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.connect_instances;datacenter=dc1;kind=connect-proxy": {
Name: "consul.usage.test.state.connect_instances",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "connect-proxy"},
},
},
"consul.usage.test.consul.state.connect_instances;datacenter=dc1;kind=terminating-gateway": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.connect_instances",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "terminating-gateway"},
Add metrics to count service mesh Kind instance counts This will add the counts of service mesh instances tagged by the different ServiceKind's.
2021-09-30 21:15:26 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.connect_instances;datacenter=dc1;kind=terminating-gateway": {
Name: "consul.usage.test.state.connect_instances",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "terminating-gateway"},
},
},
"consul.usage.test.consul.state.connect_instances;datacenter=dc1;kind=ingress-gateway": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.connect_instances",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "ingress-gateway"},
Add metrics to count service mesh Kind instance counts This will add the counts of service mesh instances tagged by the different ServiceKind's.
2021-09-30 21:15:26 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.connect_instances;datacenter=dc1;kind=ingress-gateway": {
Name: "consul.usage.test.state.connect_instances",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "ingress-gateway"},
},
},
"consul.usage.test.consul.state.connect_instances;datacenter=dc1;kind=mesh-gateway": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.connect_instances",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "mesh-gateway"},
Add metrics to count connect native service mesh instances This will add the counts of the service mesh instances tagged by whether or not it is connect native
2021-09-30 21:48:21 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.connect_instances;datacenter=dc1;kind=mesh-gateway": {
Name: "consul.usage.test.state.connect_instances",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "mesh-gateway"},
},
},
"consul.usage.test.consul.state.connect_instances;datacenter=dc1;kind=connect-native": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.connect_instances",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "connect-native"},
Add KVUsage to consul state usage metrics This change will add the number of entries in the consul KV store to the already existing usage metrics.
2021-09-17 19:36:34 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.connect_instances;datacenter=dc1;kind=connect-native": {
Name: "consul.usage.test.state.connect_instances",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "connect-native"},
},
},
Add the `operator usage instances` command and api endpoint (#16205) This endpoint shows total services, connect service instances and billable service instances in the local datacenter or globally. Billable instances = total service instances - connect services - consul server instances.
2023-02-08 20:07:21 +00:00
"consul.usage.test.state.billable_service_instances;datacenter=dc1": {
Name: "consul.usage.test.state.billable_service_instances",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
},
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
// --- kv ---
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.consul.state.kv_entries;datacenter=dc1": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.kv_entries",
Value: 0,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.kv_entries;datacenter=dc1": {
Name: "consul.usage.test.state.kv_entries",
Value: 0,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
// --- config entries ---
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=service-intentions": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "service-intentions"},
Add metrics to count the number of service-mesh config entries
2021-10-01 18:22:30 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.config_entries;datacenter=dc1;kind=service-intentions": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "service-intentions"},
},
},
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=service-resolver": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "service-resolver"},
Add metrics to count the number of service-mesh config entries
2021-10-01 18:22:30 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.config_entries;datacenter=dc1;kind=service-resolver": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "service-resolver"},
},
},
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=service-router": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "service-router"},
Add metrics to count the number of service-mesh config entries
2021-10-01 18:22:30 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.config_entries;datacenter=dc1;kind=service-router": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "service-router"},
},
},
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=service-defaults": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "service-defaults"},
Add metrics to count the number of service-mesh config entries
2021-10-01 18:22:30 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.config_entries;datacenter=dc1;kind=service-defaults": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "service-defaults"},
},
},
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=ingress-gateway": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "ingress-gateway"},
Add metrics to count the number of service-mesh config entries
2021-10-01 18:22:30 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.config_entries;datacenter=dc1;kind=ingress-gateway": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "ingress-gateway"},
},
},
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=service-splitter": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "service-splitter"},
Add metrics to count the number of service-mesh config entries
2021-10-01 18:22:30 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.config_entries;datacenter=dc1;kind=service-splitter": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "service-splitter"},
},
},
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=mesh": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "mesh"},
Add metrics to count the number of service-mesh config entries
2021-10-01 18:22:30 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.config_entries;datacenter=dc1;kind=mesh": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "mesh"},
},
},
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=proxy-defaults": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "proxy-defaults"},
Add metrics to count the number of service-mesh config entries
2021-10-01 18:22:30 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.config_entries;datacenter=dc1;kind=proxy-defaults": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "proxy-defaults"},
},
},
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=terminating-gateway": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "terminating-gateway"},
Add metrics to count the number of service-mesh config entries
2021-10-01 18:22:30 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.config_entries;datacenter=dc1;kind=terminating-gateway": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "terminating-gateway"},
},
},
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=exported-services": { // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "exported-services"},
Add new service-exports config entry
2021-10-20 19:24:18 +00:00
},
state: partition the usage metrics subsystem (#10867)
2021-08-18 14:27:15 +00:00
},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
"consul.usage.test.state.config_entries;datacenter=dc1;kind=exported-services": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "exported-services"},
},
},
Add sameness-group configuration entry. (#16608) This commit adds a sameness-group config entry to the API and structs packages. It includes some validation logic and a new memdb index that tracks the default sameness-group for each partition. Sameness groups will simplify the effort of managing failovers / intentions / exports for peers and partitions. Note that this change purely to introduce the configuration entry and does not include the full functionality of sameness-groups.
2023-03-13 21:19:11 +00:00
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=sameness-group": { // Legacy
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "sameness-group"},
},
},
"consul.usage.test.state.config_entries;datacenter=dc1;kind=sameness-group": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "sameness-group"},
},
},
Native API Gateway Config Entries (#15897) * Stub Config Entries for Consul Native API Gateway (#15644) * Add empty InlineCertificate struct and protobuf * apigateway stubs * Stub HTTPRoute in api pkg * Stub HTTPRoute in structs pkg * Simplify api.APIGatewayConfigEntry to be consistent w/ other entries * Update makeConfigEntry switch, add docstring for HTTPRouteConfigEntry * Add TCPRoute to MakeConfigEntry, return unique Kind * Stub BoundAPIGatewayConfigEntry in agent * Add RaftIndex to APIGatewayConfigEntry stub * Add new config entry kinds to validation allow-list * Add RaftIndex to other added config entry stubs * Update usage metrics assertions to include new cfg entries * Add Meta and acl.EnterpriseMeta to all new ConfigEntry types * Remove unnecessary Services field from added config entry types * Implement GetMeta(), GetEnterpriseMeta() for added config entry types * Add meta field to proto, name consistently w/ existing config entries * Format config_entry.proto * Add initial implementation of CanRead + CanWrite for new config entry types * Add unit tests for decoding of new config entry types * Add unit tests for parsing of new config entry types * Add unit tests for API Gateway config entry ACLs * Return typed PermissionDeniedError on BoundAPIGateway CanWrite * Add unit tests for added config entry ACLs * Add BoundAPIGateway type to AllConfigEntryKinds * Return proper kind from BoundAPIGateway * Add docstrings for new config entry types * Add missing config entry kinds to proto def * Update usagemetrics_oss_test.go * Use utility func for returning PermissionDeniedError * EventPublisher subscriptions for Consul Native API Gateway (#15757) * Create new event topics in subscribe proto * Add tests for PBSubscribe func * Make configs singular, add all configs to PBToStreamSubscribeRequest * Add snapshot methods * Add config_entry_events tests * Add config entry kind to topic for new configs * Add unit tests for snapshot methods * Start adding integration test * Test using the new controller code * Update agent/consul/state/config_entry_events.go * Check value of error * Add controller stubs for API Gateway (#15837) * update initial stub implementation * move files, clean up mutex references * Remove embed, use idiomatic names for constructors * Remove stray file introduced in merge * Add APIGateway validation (#15847) * Add APIGateway validation * Add additional validations * Add cert ref validation * Add protobuf definitions * Fix up field types * Add API structs * Move struct fields around a bit * APIGateway InlineCertificate validation (#15856) * Add APIGateway validation * Add additional validations * Add protobuf definitions * Tabs to spaces * Add API structs * Move struct fields around a bit * Add validation for InlineCertificate * Fix ACL test * APIGateway BoundAPIGateway validation (#15858) * Add APIGateway validation * Add additional validations * Add cert ref validation * Add protobuf definitions * Fix up field types * Add API structs * Move struct fields around a bit * Add validation for BoundAPIGateway * APIGateway TCPRoute validation (#15855) * Add APIGateway validation * Add additional validations * Add cert ref validation * Add protobuf definitions * Fix up field types * Add API structs * Add TCPRoute normalization and validation * Add forgotten Status * Add some more field docs in api package * Fix test * Format imports * Rename snapshot test variable names * Add plumbing for Native API GW Subscriptions (#16003) Co-authored-by: Sarah Alsmiller <sarah.alsmiller@hashicorp.com> Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com> Co-authored-by: sarahalsmiller <100602640+sarahalsmiller@users.noreply.github.com> Co-authored-by: Andrew Stucki <andrew.stucki@hashicorp.com>
2023-01-18 22:14:34 +00:00
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=api-gateway": { // Legacy
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "api-gateway"},
},
},
"consul.usage.test.state.config_entries;datacenter=dc1;kind=api-gateway": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "api-gateway"},
},
},
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=bound-api-gateway": { // Legacy
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "bound-api-gateway"},
},
},
"consul.usage.test.state.config_entries;datacenter=dc1;kind=bound-api-gateway": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "bound-api-gateway"},
},
},
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=inline-certificate": { // Legacy
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "inline-certificate"},
},
},
"consul.usage.test.state.config_entries;datacenter=dc1;kind=inline-certificate": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "inline-certificate"},
},
},
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=http-route": { // Legacy
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "http-route"},
},
},
"consul.usage.test.state.config_entries;datacenter=dc1;kind=http-route": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "http-route"},
},
},
"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=tcp-route": { // Legacy
Name: "consul.usage.test.consul.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "tcp-route"},
},
},
"consul.usage.test.state.config_entries;datacenter=dc1;kind=tcp-route": {
Name: "consul.usage.test.state.config_entries",
Value: 0,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "tcp-route"},
},
},
state: partition the usage metrics subsystem (#10867)
2021-08-18 14:27:15 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
},
}
func TestUsageReporter_emitNodeUsage_OSS(t *testing.T) {
cases := baseCases
state: partition the usage metrics subsystem (#10867)
2021-08-18 14:27:15 +00:00
for name, tcase := range cases {
t.Run(name, func(t *testing.T) {
// Only have a single interval for the test
sink := metrics.NewInmemSink(1*time.Minute, 1*time.Minute)
cfg := metrics.DefaultConfig("consul.usage.test")
cfg.EnableHostname = false
metrics.NewGlobal(cfg, sink)
mockStateProvider := &mockStateProvider{}
s, err := newStateStore()
require.NoError(t, err)
if tcase.modfiyStateStore != nil {
tcase.modfiyStateStore(t, s)
}
mockStateProvider.On("State").Return(s)
reporter, err := NewUsageMetricsReporter(
new(Config).
WithStateProvider(mockStateProvider).
WithLogger(testutil.Logger(t)).
WithDatacenter("dc1").
WithGetMembersFunc(tcase.getMembersFunc),
)
require.NoError(t, err)
reporter.runOnce()
intervals := sink.Data()
require.Len(t, intervals, 1)
intv := intervals[0]
assertEqualGaugeMaps(t, tcase.expectedGauges, intv.Gauges)
})
}
}
Add peer counts to emitted metrics. (#13930)
2022-07-27 22:34:04 +00:00
func TestUsageReporter_emitPeeringUsage_OSS(t *testing.T) {
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
cases := make(map[string]testCase)
for k, v := range baseCases {
eg := make(map[string]metrics.GaugeValue)
for k, v := range v.expectedGauges {
eg[k] = v
}
cases[k] = testCase{v.modfiyStateStore, v.getMembersFunc, eg}
Add peer counts to emitted metrics. (#13930)
2022-07-27 22:34:04 +00:00
}
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
peeringsCase := cases["nodes"]
peeringsCase.modfiyStateStore = func(t *testing.T, s *state.Store) {
id, err := uuid.GenerateUUID()
require.NoError(t, err)
require.NoError(t, s.PeeringWrite(1, &pbpeering.PeeringWriteRequest{Peering: &pbpeering.Peering{Name: "foo", ID: id}}))
id, err = uuid.GenerateUUID()
require.NoError(t, err)
require.NoError(t, s.PeeringWrite(2, &pbpeering.PeeringWriteRequest{Peering: &pbpeering.Peering{Name: "bar", ID: id}}))
id, err = uuid.GenerateUUID()
require.NoError(t, err)
require.NoError(t, s.PeeringWrite(3, &pbpeering.PeeringWriteRequest{Peering: &pbpeering.Peering{Name: "baz", ID: id}}))
}
peeringsCase.getMembersFunc = func() []serf.Member {
return []serf.Member{
{
Name: "foo",
Tags: map[string]string{"role": "consul"},
Status: serf.StatusAlive,
Add peer counts to emitted metrics. (#13930)
2022-07-27 22:34:04 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
{
Name: "bar",
Tags: map[string]string{"role": "consul"},
Status: serf.StatusAlive,
Add peer counts to emitted metrics. (#13930)
2022-07-27 22:34:04 +00:00
},
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
}
}
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
peeringsCase.expectedGauges["consul.usage.test.consul.state.nodes;datacenter=dc1"] = metrics.GaugeValue{ // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.nodes",
Value: 0,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
}
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
peeringsCase.expectedGauges["consul.usage.test.state.nodes;datacenter=dc1"] = metrics.GaugeValue{
Name: "consul.usage.test.state.nodes",
Value: 0,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
}
peeringsCase.expectedGauges["consul.usage.test.consul.state.peerings;datacenter=dc1"] = metrics.GaugeValue{ // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.peerings",
Value: 3,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
}
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
peeringsCase.expectedGauges["consul.usage.test.state.peerings;datacenter=dc1"] = metrics.GaugeValue{
Name: "consul.usage.test.state.peerings",
Value: 3,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
}
peeringsCase.expectedGauges["consul.usage.test.consul.members.clients;datacenter=dc1"] = metrics.GaugeValue{ // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.members.clients",
Value: 0,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
Add peer counts to emitted metrics. (#13930)
2022-07-27 22:34:04 +00:00
}
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
peeringsCase.expectedGauges["consul.usage.test.members.clients;datacenter=dc1"] = metrics.GaugeValue{
Name: "consul.usage.test.members.clients",
Value: 0,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
}
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
cases["peerings"] = peeringsCase
delete(cases, "nodes")
Add peer counts to emitted metrics. (#13930)
2022-07-27 22:34:04 +00:00
for name, tcase := range cases {
t.Run(name, func(t *testing.T) {
// Only have a single interval for the test
sink := metrics.NewInmemSink(1*time.Minute, 1*time.Minute)
cfg := metrics.DefaultConfig("consul.usage.test")
cfg.EnableHostname = false
metrics.NewGlobal(cfg, sink)
mockStateProvider := &mockStateProvider{}
s, err := newStateStore()
require.NoError(t, err)
if tcase.modfiyStateStore != nil {
tcase.modfiyStateStore(t, s)
}
mockStateProvider.On("State").Return(s)
reporter, err := NewUsageMetricsReporter(
new(Config).
WithStateProvider(mockStateProvider).
WithLogger(testutil.Logger(t)).
WithDatacenter("dc1").
WithGetMembersFunc(tcase.getMembersFunc),
)
require.NoError(t, err)
reporter.runOnce()
intervals := sink.Data()
require.Len(t, intervals, 1)
intv := intervals[0]
assertEqualGaugeMaps(t, tcase.expectedGauges, intv.Gauges)
})
}
}
state: partition the usage metrics subsystem (#10867)
2021-08-18 14:27:15 +00:00
func TestUsageReporter_emitServiceUsage_OSS(t *testing.T) {
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
cases := make(map[string]testCase)
for k, v := range baseCases {
eg := make(map[string]metrics.GaugeValue)
for k, v := range v.expectedGauges {
eg[k] = v
}
cases[k] = testCase{v.modfiyStateStore, v.getMembersFunc, eg}
state: partition the usage metrics subsystem (#10867)
2021-08-18 14:27:15 +00:00
}
Add metrics to count service mesh Kind instance counts This will add the counts of service mesh instances tagged by the different ServiceKind's.
2021-09-30 21:15:26 +00:00
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
nodesAndSvcsCase := cases["nodes"]
nodesAndSvcsCase.modfiyStateStore = func(t *testing.T, s *state.Store) {
require.NoError(t, s.EnsureNode(1, &structs.Node{Node: "foo", Address: "127.0.0.1"}))
require.NoError(t, s.EnsureNode(2, &structs.Node{Node: "bar", Address: "127.0.0.2"}))
require.NoError(t, s.EnsureNode(3, &structs.Node{Node: "baz", Address: "127.0.0.2"}))
require.NoError(t, s.EnsureNode(4, &structs.Node{Node: "qux", Address: "127.0.0.3"}))
mgw := structs.TestNodeServiceMeshGateway(t)
mgw.ID = "mesh-gateway"
tgw := structs.TestNodeServiceTerminatingGateway(t, "1.1.1.1")
tgw.ID = "terminating-gateway"
// Typical services and some consul services spread across two nodes
require.NoError(t, s.EnsureService(5, "foo", &structs.NodeService{ID: "db", Service: "db", Tags: nil, Address: "", Port: 5000}))
require.NoError(t, s.EnsureService(6, "bar", &structs.NodeService{ID: "api", Service: "api", Tags: nil, Address: "", Port: 5000}))
require.NoError(t, s.EnsureService(7, "foo", &structs.NodeService{ID: "consul", Service: "consul", Tags: nil}))
require.NoError(t, s.EnsureService(8, "bar", &structs.NodeService{ID: "consul", Service: "consul", Tags: nil}))
require.NoError(t, s.EnsureService(9, "foo", &structs.NodeService{ID: "db-connect-proxy", Service: "db-connect-proxy", Tags: nil, Address: "", Port: 5000, Kind: structs.ServiceKindConnectProxy}))
require.NoError(t, s.EnsureRegistration(10, structs.TestRegisterIngressGateway(t)))
require.NoError(t, s.EnsureService(11, "foo", mgw))
require.NoError(t, s.EnsureService(12, "foo", tgw))
require.NoError(t, s.EnsureService(13, "bar", &structs.NodeService{ID: "db-native", Service: "db", Tags: nil, Address: "", Port: 5000, Connect: structs.ServiceConnect{Native: true}}))
require.NoError(t, s.EnsureConfigEntry(14, &structs.IngressGatewayConfigEntry{
Kind: structs.IngressGateway,
Name: "foo",
}))
require.NoError(t, s.EnsureConfigEntry(15, &structs.IngressGatewayConfigEntry{
Kind: structs.IngressGateway,
Name: "bar",
}))
require.NoError(t, s.EnsureConfigEntry(16, &structs.IngressGatewayConfigEntry{
Kind: structs.IngressGateway,
Name: "baz",
}))
}
baseCaseMembers := nodesAndSvcsCase.getMembersFunc()
nodesAndSvcsCase.getMembersFunc = func() []serf.Member {
baseCaseMembers = append(baseCaseMembers, serf.Member{
Name: "baz",
Tags: map[string]string{"role": "node", "segment": "a"},
Status: serf.StatusAlive,
})
baseCaseMembers = append(baseCaseMembers, serf.Member{
Name: "qux",
Tags: map[string]string{"role": "node", "segment": "b"},
Status: serf.StatusAlive,
})
return baseCaseMembers
}
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
nodesAndSvcsCase.expectedGauges["consul.usage.test.consul.state.nodes;datacenter=dc1"] = metrics.GaugeValue{ // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.nodes",
Value: 4,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
}
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
nodesAndSvcsCase.expectedGauges["consul.usage.test.state.nodes;datacenter=dc1"] = metrics.GaugeValue{
Name: "consul.usage.test.state.nodes",
Value: 4,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
}
nodesAndSvcsCase.expectedGauges["consul.usage.test.consul.members.clients;datacenter=dc1"] = metrics.GaugeValue{ // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.members.clients",
Value: 2,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
}
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
nodesAndSvcsCase.expectedGauges["consul.usage.test.members.clients;datacenter=dc1"] = metrics.GaugeValue{
Name: "consul.usage.test.members.clients",
Value: 2,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
}
nodesAndSvcsCase.expectedGauges["consul.usage.test.consul.state.services;datacenter=dc1"] = metrics.GaugeValue{ // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.services",
Value: 7,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
}
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
nodesAndSvcsCase.expectedGauges["consul.usage.test.state.services;datacenter=dc1"] = metrics.GaugeValue{
Name: "consul.usage.test.state.services",
Value: 7,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
}
nodesAndSvcsCase.expectedGauges["consul.usage.test.consul.state.service_instances;datacenter=dc1"] = metrics.GaugeValue{ // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.service_instances",
Value: 9,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
}
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
nodesAndSvcsCase.expectedGauges["consul.usage.test.state.service_instances;datacenter=dc1"] = metrics.GaugeValue{
Name: "consul.usage.test.state.service_instances",
Value: 9,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
}
nodesAndSvcsCase.expectedGauges["consul.usage.test.consul.state.connect_instances;datacenter=dc1;kind=connect-proxy"] = metrics.GaugeValue{ // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.connect_instances",
Value: 1,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "connect-proxy"},
},
}
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
nodesAndSvcsCase.expectedGauges["consul.usage.test.state.connect_instances;datacenter=dc1;kind=connect-proxy"] = metrics.GaugeValue{
Name: "consul.usage.test.state.connect_instances",
Value: 1,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "connect-proxy"},
},
}
nodesAndSvcsCase.expectedGauges["consul.usage.test.consul.state.connect_instances;datacenter=dc1;kind=terminating-gateway"] = metrics.GaugeValue{ // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.connect_instances",
Value: 1,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "terminating-gateway"},
Emit service usage metrics with correct labeling strategy (#8856) Previously, we would emit service usage metrics both with and without a namespace label attached. This is problematic in the case when you want to aggregate metrics together, i.e. "sum(consul.state.services)". This would cause services to be counted twice in that aggregate, once via the metric emitted with a namespace label, and once in the metric emited without any namespace label.
2020-10-09 16:01:45 +00:00
},
}
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
nodesAndSvcsCase.expectedGauges["consul.usage.test.state.connect_instances;datacenter=dc1;kind=terminating-gateway"] = metrics.GaugeValue{
Name: "consul.usage.test.state.connect_instances",
Value: 1,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "terminating-gateway"},
},
}
nodesAndSvcsCase.expectedGauges["consul.usage.test.consul.state.connect_instances;datacenter=dc1;kind=ingress-gateway"] = metrics.GaugeValue{ // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.connect_instances",
Value: 1,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "ingress-gateway"},
},
}
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
nodesAndSvcsCase.expectedGauges["consul.usage.test.state.connect_instances;datacenter=dc1;kind=ingress-gateway"] = metrics.GaugeValue{
Name: "consul.usage.test.state.connect_instances",
Value: 1,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "ingress-gateway"},
},
}
nodesAndSvcsCase.expectedGauges["consul.usage.test.consul.state.connect_instances;datacenter=dc1;kind=mesh-gateway"] = metrics.GaugeValue{ // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.connect_instances",
Value: 1,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "mesh-gateway"},
},
}
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
nodesAndSvcsCase.expectedGauges["consul.usage.test.state.connect_instances;datacenter=dc1;kind=mesh-gateway"] = metrics.GaugeValue{
Name: "consul.usage.test.state.connect_instances",
Value: 1,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "mesh-gateway"},
},
}
nodesAndSvcsCase.expectedGauges["consul.usage.test.consul.state.connect_instances;datacenter=dc1;kind=connect-native"] = metrics.GaugeValue{ // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.connect_instances",
Value: 1,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "connect-native"},
},
}
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
nodesAndSvcsCase.expectedGauges["consul.usage.test.state.connect_instances;datacenter=dc1;kind=connect-native"] = metrics.GaugeValue{
Name: "consul.usage.test.state.connect_instances",
Value: 1,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "connect-native"},
},
}
Add the `operator usage instances` command and api endpoint (#16205) This endpoint shows total services, connect service instances and billable service instances in the local datacenter or globally. Billable instances = total service instances - connect services - consul server instances.
2023-02-08 20:07:21 +00:00
nodesAndSvcsCase.expectedGauges["consul.usage.test.state.billable_service_instances;datacenter=dc1"] = metrics.GaugeValue{
Name: "consul.usage.test.state.billable_service_instances",
Value: 3,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
},
}
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
nodesAndSvcsCase.expectedGauges["consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=ingress-gateway"] = metrics.GaugeValue{ // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.config_entries",
Value: 3,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "ingress-gateway"},
},
}
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
nodesAndSvcsCase.expectedGauges["consul.usage.test.state.config_entries;datacenter=dc1;kind=ingress-gateway"] = metrics.GaugeValue{
Name: "consul.usage.test.state.config_entries",
Value: 3,
Labels: []metrics.Label{
{Name: "datacenter", Value: "dc1"},
{Name: "kind", Value: "ingress-gateway"},
},
}
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
cases["nodes-and-services"] = nodesAndSvcsCase
delete(cases, "nodes")
Emit service usage metrics with correct labeling strategy (#8856) Previously, we would emit service usage metrics both with and without a namespace label attached. This is problematic in the case when you want to aggregate metrics together, i.e. "sum(consul.state.services)". This would cause services to be counted twice in that aggregate, once via the metric emitted with a namespace label, and once in the metric emited without any namespace label.
2020-10-09 16:01:45 +00:00
for name, tcase := range cases {
t.Run(name, func(t *testing.T) {
// Only have a single interval for the test
sink := metrics.NewInmemSink(1*time.Minute, 1*time.Minute)
cfg := metrics.DefaultConfig("consul.usage.test")
cfg.EnableHostname = false
metrics.NewGlobal(cfg, sink)
mockStateProvider := &mockStateProvider{}
stream: Use a no-op event publisher if streaming is disabled
2020-10-23 19:21:37 +00:00
s := state.NewStateStore(nil)
Emit service usage metrics with correct labeling strategy (#8856) Previously, we would emit service usage metrics both with and without a namespace label attached. This is problematic in the case when you want to aggregate metrics together, i.e. "sum(consul.state.services)". This would cause services to be counted twice in that aggregate, once via the metric emitted with a namespace label, and once in the metric emited without any namespace label.
2020-10-09 16:01:45 +00:00
if tcase.modfiyStateStore != nil {
tcase.modfiyStateStore(t, s)
}
mockStateProvider.On("State").Return(s)
reporter, err := NewUsageMetricsReporter(
new(Config).
WithStateProvider(mockStateProvider).
WithLogger(testutil.Logger(t)).
usagemetrics: add cluster members to metrics API (#10340) This PR adds cluster members to the metrics API. The number of members per segment are reported as well as the total number of members. Tested by running a multi-node cluster locally and ensuring the numbers were correct. Also added unit test coverage to add the new expected gauges to existing test cases.
2021-06-03 15:25:53 +00:00
WithDatacenter("dc1").
WithGetMembersFunc(tcase.getMembersFunc),
Emit service usage metrics with correct labeling strategy (#8856) Previously, we would emit service usage metrics both with and without a namespace label attached. This is problematic in the case when you want to aggregate metrics together, i.e. "sum(consul.state.services)". This would cause services to be counted twice in that aggregate, once via the metric emitted with a namespace label, and once in the metric emited without any namespace label.
2020-10-09 16:01:45 +00:00
)
require.NoError(t, err)
reporter.runOnce()
intervals := sink.Data()
require.Len(t, intervals, 1)
intv := intervals[0]
state: partition the usage metrics subsystem (#10867)
2021-08-18 14:27:15 +00:00
assertEqualGaugeMaps(t, tcase.expectedGauges, intv.Gauges)
Emit service usage metrics with correct labeling strategy (#8856) Previously, we would emit service usage metrics both with and without a namespace label attached. This is problematic in the case when you want to aggregate metrics together, i.e. "sum(consul.state.services)". This would cause services to be counted twice in that aggregate, once via the metric emitted with a namespace label, and once in the metric emited without any namespace label.
2020-10-09 16:01:45 +00:00
})
}
}
Add KVUsage to consul state usage metrics This change will add the number of entries in the consul KV store to the already existing usage metrics.
2021-09-17 19:36:34 +00:00
func TestUsageReporter_emitKVUsage_OSS(t *testing.T) {
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
cases := make(map[string]testCase)
for k, v := range baseCases {
eg := make(map[string]metrics.GaugeValue)
for k, v := range v.expectedGauges {
eg[k] = v
}
cases[k] = testCase{v.modfiyStateStore, v.getMembersFunc, eg}
Add KVUsage to consul state usage metrics This change will add the number of entries in the consul KV store to the already existing usage metrics.
2021-09-17 19:36:34 +00:00
}
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
nodesCase := cases["nodes"]
mss := nodesCase.modfiyStateStore
nodesCase.modfiyStateStore = func(t *testing.T, s *state.Store) {
mss(t, s)
require.NoError(t, s.KVSSet(4, &structs.DirEntry{Key: "a", Value: []byte{1}}))
require.NoError(t, s.KVSSet(5, &structs.DirEntry{Key: "b", Value: []byte{1}}))
require.NoError(t, s.KVSSet(6, &structs.DirEntry{Key: "c", Value: []byte{1}}))
require.NoError(t, s.KVSSet(7, &structs.DirEntry{Key: "d", Value: []byte{1}}))
require.NoError(t, s.KVSDelete(8, "d", &acl.EnterpriseMeta{}))
require.NoError(t, s.KVSDelete(9, "c", &acl.EnterpriseMeta{}))
require.NoError(t, s.KVSSet(10, &structs.DirEntry{Key: "e", Value: []byte{1}}))
require.NoError(t, s.KVSSet(11, &structs.DirEntry{Key: "f", Value: []byte{1}}))
}
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
nodesCase.expectedGauges["consul.usage.test.consul.state.kv_entries;datacenter=dc1"] = metrics.GaugeValue{ // Legacy
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
Name: "consul.usage.test.consul.state.kv_entries",
Value: 4,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
add non-double-prefixed metrics (#14193)
2022-09-09 17:13:43 +00:00
}
nodesCase.expectedGauges["consul.usage.test.state.kv_entries;datacenter=dc1"] = metrics.GaugeValue{
Name: "consul.usage.test.state.kv_entries",
Value: 4,
Labels: []metrics.Label{{Name: "datacenter", Value: "dc1"}},
Add KVUsage to consul state usage metrics This change will add the number of entries in the consul KV store to the already existing usage metrics.
2021-09-17 19:36:34 +00:00
}
no-op: refactor usagemetrics tests for clarity and DRY cases (#14313)
2022-08-24 17:00:09 +00:00
cases["nodes"] = nodesCase
Add KVUsage to consul state usage metrics This change will add the number of entries in the consul KV store to the already existing usage metrics.
2021-09-17 19:36:34 +00:00
for name, tcase := range cases {
t.Run(name, func(t *testing.T) {
// Only have a single interval for the test
sink := metrics.NewInmemSink(1*time.Minute, 1*time.Minute)
cfg := metrics.DefaultConfig("consul.usage.test")
cfg.EnableHostname = false
metrics.NewGlobal(cfg, sink)
mockStateProvider := &mockStateProvider{}
s, err := newStateStore()
require.NoError(t, err)
if tcase.modfiyStateStore != nil {
tcase.modfiyStateStore(t, s)
}
mockStateProvider.On("State").Return(s)
reporter, err := NewUsageMetricsReporter(
new(Config).
WithStateProvider(mockStateProvider).
WithLogger(testutil.Logger(t)).
WithDatacenter("dc1").
WithGetMembersFunc(tcase.getMembersFunc),
)
require.NoError(t, err)
reporter.runOnce()
intervals := sink.Data()
require.Len(t, intervals, 1)
intv := intervals[0]
assertEqualGaugeMaps(t, tcase.expectedGauges, intv.Gauges)
})
}
}