Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[file-sd-part-2] Query e2e test uses different service discovery options #554

Merged
merged 9 commits into from
Oct 16, 2018

Conversation

ivan-valkov
Copy link

@ivan-valkov ivan-valkov commented Oct 5, 2018

ref: #492

Changes

The query e2e test now runs 3 times with different service discovery options:

  • only gossip
  • only static flag configuration
  • only file sd

Verification

The tests pass

},
} {
//TODO(ivan): delete this
fmt.Printf("Starting TestQuerySimple with service discovery: %v\n", name)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if ok := t.Run(t, name, "" ) {

}

@@ -17,9 +17,38 @@ import (
"github.com/prometheus/common/model"
)

func TestQuery(t *testing.T) {
for name, conf := range map[string]sdConfig{
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pkg/compact/retention_test.go:21

@ivan-valkov ivan-valkov changed the title Query e2e test uses different service discovery options [file-sd-part-2] Query e2e test uses different service discovery options Oct 10, 2018
})
}
}

// TestQuerySimple runs a setup of Prometheus servers, sidecars, and query nodes and verifies that
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit update comment ot new name

test/e2e/query_test.go Show resolved Hide resolved
Copy link
Contributor

@domgreen domgreen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.

Copy link
Contributor

@domgreen domgreen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good

@ivan-valkov ivan-valkov force-pushed the file-sd-query-test branch 2 times, most recently from 940080a to 1e77f44 Compare October 16, 2018 11:20
Copy link
Contributor

@domgreen domgreen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks legit

@ivan-valkov ivan-valkov merged commit be86f5c into file-sd-query Oct 16, 2018
ivan-valkov pushed a commit that referenced this pull request Oct 16, 2018
Addressed PR comments

More pr comments addressed

Added logs and metrics when removing dups

Removed redundant check

Added flag for file sd refresh interval

Changed default fileSD interval to 5m

make docs

[file-sd-part-2] Query e2e test uses different service discovery options (#554)

* Query e2e tests different sd options
@ivan-valkov ivan-valkov deleted the file-sd-query-test branch October 17, 2018 16:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants