mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
28f2b07623
Follow up to file-moves done in the previous commit. The commit contains purely mechanical consequences of execution (apart of scripts/genproto.sh): % find ./ -name '*.go' | xargs sed --follow-symlinks -i 's|v3/etcdserver/api/v3rpc/rpctypes|v3/api/v3rpc/rpctypes|g' % find ./ -name '*.go' | xargs sed --follow-symlinks -i 's|v3/version|v3/api/version|g' % find ./ -name '*.go' | xargs sed --follow-symlinks -i 's|v3/mvcc/mvccpb|v3/api/mvccpb|g' % find ./ -name '*.go' | xargs sed --follow-symlinks -i 's|v3/etcdserver/etcdserverpb|v3/api/etcdserverpb|g' % find ./ -name '*.go' | xargs sed --follow-symlinks -i 's|v3/etcdserver/api/membership/membershippb|v3/api/membershippb|g' % find ./ -name '*.go' | xargs sed --follow-symlinks -i 's|v3/auth/authpb|v3/api/authpb|g' % find ./ -name '*.proto' -o -name '*.md' | xargs -L 1 sed --follow-symlinks -i 's|/mvcc/mvccpb/kv.proto|/api/mvccpb/kv.proto|g' % find ./ -name '*.proto' -o -name '*.md' | xargs -L 1 sed --follow-symlinks -i 's|/auth/authpb/auth.proto|/api/authpb/auth.proto|g' % find ./ -name '*.proto' -o -name '*.md' | xargs -L 1 sed --follow-symlinks -i 's|/etcdserver/api/membership/membershippb/membership.proto|/api/membershippb/membership.proto|g' I also modified manually paths in scripts/genproto.sh. % go fmt ./...
67 lines
1.9 KiB
Go
67 lines
1.9 KiB
Go
// Copyright 2017 The etcd Authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package e2e
|
|
|
|
import (
|
|
"fmt"
|
|
"testing"
|
|
|
|
"go.etcd.io/etcd/api/v3/version"
|
|
)
|
|
|
|
func TestV3MetricsSecure(t *testing.T) {
|
|
cfg := configTLS
|
|
cfg.clusterSize = 1
|
|
cfg.metricsURLScheme = "https"
|
|
testCtl(t, metricsTest)
|
|
}
|
|
|
|
func TestV3MetricsInsecure(t *testing.T) {
|
|
cfg := configTLS
|
|
cfg.clusterSize = 1
|
|
cfg.metricsURLScheme = "http"
|
|
testCtl(t, metricsTest)
|
|
}
|
|
|
|
func metricsTest(cx ctlCtx) {
|
|
if err := ctlV3Put(cx, "k", "v", ""); err != nil {
|
|
cx.t.Fatal(err)
|
|
}
|
|
|
|
i := 0
|
|
for _, test := range []struct {
|
|
endpoint, expected string
|
|
}{
|
|
{"/metrics", fmt.Sprintf("etcd_mvcc_put_total 2")},
|
|
{"/metrics", fmt.Sprintf("etcd_debugging_mvcc_keys_total 1")},
|
|
{"/metrics", fmt.Sprintf("etcd_mvcc_delete_total 3")},
|
|
{"/metrics", fmt.Sprintf(`etcd_server_version{server_version="%s"} 1`, version.Version)},
|
|
{"/metrics", fmt.Sprintf(`etcd_cluster_version{cluster_version="%s"} 1`, version.Cluster(version.Version))},
|
|
{"/health", `{"health":"true","reason":""}`},
|
|
} {
|
|
i++
|
|
if err := ctlV3Put(cx, fmt.Sprintf("%d", i), "v", ""); err != nil {
|
|
cx.t.Fatal(err)
|
|
}
|
|
if err := ctlV3Del(cx, []string{fmt.Sprintf("%d", i)}, 1); err != nil {
|
|
cx.t.Fatal(err)
|
|
}
|
|
|
|
if err := cURLGet(cx.epc, cURLReq{endpoint: test.endpoint, expected: test.expected, metricsURLScheme: cx.cfg.metricsURLScheme}); err != nil {
|
|
cx.t.Fatalf("failed get with curl (%v)", err)
|
|
}
|
|
}
|
|
}
|