File tree 3 files changed +18
-3
lines changed
3 files changed +18
-3
lines changed Original file line number Diff line number Diff line change @@ -22,3 +22,11 @@ https://github.com/elastic/beats/compare/v6.7.0..6.7[Check the HEAD diff]
22
22
23
23
==== Added
24
24
25
+ - Metricset generator generates beta modules by default now. {pull}10657[10657]
26
+ - The `beat.Event` accessor methods now support `@metadata` keys. {pull}10761[10761]
27
+ - Assertion for documented fields in tests fails if any of the fields in the tested event is documented as an alias. {pull}10921[10921]
28
+ - Support for Logger in the Metricset base instance. {pull}11106[11106]
29
+ - Introduce processing.Support to instance.Setting. This allows Beats to fully modify the event processing. {pull}10801[10801]
30
+ - Filebeat modules can now use ingest pipelines in YAML format. {pull}11209[11209]
31
+ - Added support for using PYTHON_EXE to control what Python interpreter is used
32
+ by `make` and `mage`. Example: `export PYTHON_EXE=python2.7`. {pull}11212[11212]
Original file line number Diff line number Diff line change @@ -162,10 +162,17 @@ func PythonVirtualenv() (string, error) {
162
162
return pythonVirtualenvDir , nil
163
163
}
164
164
165
+ // If set use PYTHON_EXE env var as the python interpreter.
166
+ var args []string
167
+ if pythonExe := os .Getenv ("PYTHON_EXE" ); pythonExe != "" {
168
+ args = append (args , "-p" , pythonExe )
169
+ }
170
+ args = append (args , ve )
171
+
165
172
// Execute virtualenv.
166
173
if _ , err := os .Stat (ve ); err != nil {
167
174
// Run virtualenv if the dir does not exist.
168
- if err := sh .Run ("virtualenv" , ve ); err != nil {
175
+ if err := sh .Run ("virtualenv" , args ... ); err != nil {
169
176
return "" , err
170
177
}
171
178
}
@@ -176,7 +183,7 @@ func PythonVirtualenv() (string, error) {
176
183
}
177
184
178
185
pip := virtualenvPath (ve , "pip" )
179
- args : = []string {"install" }
186
+ args = []string {"install" }
180
187
if ! mg .Verbose () {
181
188
args = append (args , "--quiet" )
182
189
}
Original file line number Diff line number Diff line change @@ -245,7 +245,7 @@ load-tests: ## @testing Runs load tests
245
245
# Sets up the virtual python environment
246
246
.PHONY : python-env
247
247
python-env : ${ES_BEATS}/libbeat/tests/system/requirements.txt
248
- @test -d ${PYTHON_ENV} || virtualenv ${VIRTUALENV_PARAMS} ${PYTHON_ENV}
248
+ @test -d ${PYTHON_ENV} || virtualenv $( if ${PYTHON_EXE},-p ${PYTHON_EXE}) $ {VIRTUALENV_PARAMS} ${PYTHON_ENV}
249
249
@. ${PYTHON_ENV} /bin/activate && pip install ${PIP_INSTALL_PARAMS} -q --upgrade pip ; \
250
250
if [ -a ./tests/system/requirements.txt ] && [ ! ${ES_BEATS} /libbeat/tests/system/requirements.txt -ef ./tests/system/requirements.txt ] ; then \
251
251
. ${PYTHON_ENV} /bin/activate && pip install ${PIP_INSTALL_PARAMS} -qUr ${ES_BEATS} /libbeat/tests/system/requirements.txt -Ur ./tests/system/requirements.txt ; \
You can’t perform that action at this time.
0 commit comments