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.

Sign up for GitHub

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

Jump to bottom

PMM-4825 New development environment. #31

Draft
wants to merge 12 commits into
base: main
Choose a base branch
from
Draft

PMM-4825 New development environment. #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7bf5a2b
Update deps.
AlekSi Oct 1, 2019
dd9a3a8
Bump Go and container versions.
AlekSi Oct 1, 2019
1eb1af7
Update Ubuntu distro.
AlekSi Oct 1, 2019
326abaf
feature: scrape command_counters
msurovcak Sep 10, 2019
6508909
PMM-3402 Update README.md. (#24)
fiowro Oct 1, 2019
8c36550
Extract setup functions.
AlekSi Oct 1, 2019
27033c5
Make it work with the latest ProxySQL versions.
AlekSi Oct 1, 2019
ebde9eb
Use helpers package.
AlekSi Oct 1, 2019
0377c1a
Tweak configuration.
AlekSi Oct 2, 2019
6b7c783
WIP
AlekSi Oct 5, 2019
f10e3b5
PMM-4825 Add CODEOWNERS.
AlekSi Oct 15, 2019
446d62c
PMM-4825 Disable builds for feature branches.
AlekSi Oct 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .github/CODEOWNERS
View file
Open in desktop
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @AlekSi
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/.idea/
/.vscode/

proxysql_exporter
coverage.txt
.idea
25 changes: 21 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,23 @@
dist: xenial
dist: bionic
language: go

services:
- docker

go:
- 1.12.x
- master
- 1.13.x
# - master

matrix:
fast_finish: true
allow_failures:
- go: master

# skip non-trunk PMM-XXXX branch builds, but still build pull requests
branches:
except:
- /^PMM\-\d{4}/

cache:
directories:
Expand All @@ -18,8 +29,14 @@ before_cache:
# - go clean -cache

env:
- PROXYSQL_IMAGE=percona/proxysql:1.2.1
- PROXYSQL_IMAGE=perconalab/proxysql:1.3.6
global:
- MASTER_IMAGE=percona:5.7
- SLAVE_IMAGE=percona:5.7
- CODECOV_ENV=PROXYSQL_IMAGE,PROXYSQL_CNF,PROXYSQL_CNF_DEST,MASTER_IMAGE,SLAVE_IMAGE

matrix:
- PROXYSQL_IMAGE=percona/proxysql:latest PROXYSQL_CNF=proxysql1.cnf PROXYSQL_CNF_DEST=/etc/proxysql.cnf
- PROXYSQL_IMAGE=percona/proxysql2:latest PROXYSQL_CNF=proxysql2.cnf PROXYSQL_CNF_DEST=/etc/proxysql/proxysql.cnf

before_script:
- docker --version
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ The easiest way to make a local development setup is to use Docker Compose.
```
docker-compose up
make all testall
export DATA_SOURCE_NAME='admin:admin@tcp(127.0.0.1:16032)/'
export DATA_SOURCE_NAME='proxysql-admin:proxysql-admin@tcp(127.0.0.1:6032)/'
./proxysql_exporter
```

Expand Down
130 changes: 69 additions & 61 deletions Gopkg.lock
View file
Open in desktop

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

4 changes: 4 additions & 0 deletions Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@
go-tests = true
non-go = true
unused-packages = true

[[constraint]]
name = "github.com/percona/exporter_shared"
branch = "develop"
5 changes: 5 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,10 @@ promu:
GOARCH=$(subst x86_64,amd64,$(patsubst i%86,386,$(subst aarch64,arm64,$(shell uname -m)))) \
$(GO) get -u github.com/prometheus/promu

env-up: ## Start development environment.
docker-compose up --force-recreate --renew-anon-volumes --remove-orphans

env-down: ## Stop development environment.
docker-compose down --volumes --remove-orphans

.PHONY: all style format build test vet tarball docker promu
2 changes: 1 addition & 1 deletion NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Percona ProxySQL Exporter.
Copyright 2016-2017 Percona LLC
Copyright 2016-2019 Percona LLC
Loading