diff --git a/internal/compose/compose.go b/internal/compose/compose.go index 3f6d803f2..c153542de 100644 --- a/internal/compose/compose.go +++ b/internal/compose/compose.go @@ -43,6 +43,32 @@ type portMapping struct { // UnmarshalYAML unmarshals a Docker Compose port mapping in YAML to // a portMapping. func (p *portMapping) UnmarshalYAML(node *yaml.Node) error { + // Depending on how the port mapping is specified in the Docker Compose + // configuration file, sometimes a map is returned and other times a + // string is returned. Here we first check if a map was returned. + if node.Kind == yaml.MappingNode { + b, err := yaml.Marshal(node) + if err != nil { + return errors.Wrap(err, "could not re-encode YAML map node to YAML") + } + + var s struct { + Target int + Published int + Protocol string + } + + if err := yaml.Unmarshal(b, &s); err != nil { + return errors.Wrap(err, "could not unmarshal YAML map node") + } + + p.InternalPort = s.Target + p.ExternalPort = s.Published + p.Protocol = s.Protocol + + return nil + } + var str string if err := node.Decode(&str); err != nil { return err diff --git a/internal/install/static_kibana_config_yml.go b/internal/install/static_kibana_config_yml.go index fcf9e941b..67f5ec5f6 100644 --- a/internal/install/static_kibana_config_yml.go +++ b/internal/install/static_kibana_config_yml.go @@ -20,5 +20,8 @@ xpack.ingestManager.fleet.elasticsearch.host: "http://elasticsearch:9200" xpack.ingestManager.fleet.kibana.host: "http://kibana:5601" xpack.ingestManager.fleet.tlsCheckDisabled: true +# TODO: Remove once https://github.com/elastic/kibana/issues/77613 is resolved. +xpack.ingestManager.fleet.pollingRequestTimeout: 60000 + xpack.encryptedSavedObjects.encryptionKey: "12345678901234567890123456789012" ` diff --git a/internal/kibana/ingestmanager/client_policies.go b/internal/kibana/ingestmanager/client_policies.go index 023dd2a6a..7c8fd6119 100644 --- a/internal/kibana/ingestmanager/client_policies.go +++ b/internal/kibana/ingestmanager/client_policies.go @@ -78,8 +78,8 @@ type Vars map[string]Var // DataStream represents a data stream within a package. type DataStream struct { - Type string `json:"type"` - DataStream string `json:"data_stream"` + Type string `json:"type"` + Dataset string `json:"dataset"` } // Stream encapsulates a data stream and it's variables. diff --git a/internal/testrunner/runners/pipeline/runner.go b/internal/testrunner/runners/pipeline/runner.go index 8c94d6a34..2106141e3 100644 --- a/internal/testrunner/runners/pipeline/runner.go +++ b/internal/testrunner/runners/pipeline/runner.go @@ -43,7 +43,7 @@ func (r *runner) run() error { return errors.Wrap(err, "locating data_stream root failed") } if !found { - return errors.New("dataStream root not found") + return errors.New("data stream root not found") } entryPipeline, pipelineIDs, err := installIngestPipelines(r.options.ESClient, dataStreamPath) diff --git a/internal/testrunner/runners/system/runner.go b/internal/testrunner/runners/system/runner.go index cac57396e..5d7976318 100644 --- a/internal/testrunner/runners/system/runner.go +++ b/internal/testrunner/runners/system/runner.go @@ -39,6 +39,7 @@ type runner struct { esClient *es.Client // Execution order of following handlers is defined in runner.tearDown() method. + deleteTestPolicyHandler func() resetAgentPolicyHandler func() shutdownServiceHandler func() wipeDataStreamHandler func() @@ -78,7 +79,7 @@ func (r *runner) run() error { return errors.Wrap(err, "locating data stream root failed") } if !found { - return errors.New("dataStream root not found") + return errors.New("data stream root not found") } dataStreamManifest, err := packages.ReadDataStreamManifest(filepath.Join(dataStreamPath, packages.DataStreamManifestFile)) @@ -133,12 +134,12 @@ func (r *runner) run() error { if err != nil { return errors.Wrap(err, "could not create test policy") } - defer func() { + r.deleteTestPolicyHandler = func() { logger.Debug("deleting test policy...") if err := im.DeletePolicy(*policy); err != nil { logger.Errorf("error cleaning up test policy: %s", err) } - }() + } testConfig, err := newConfig(r.testFolder.Path, ctxt) if err != nil { @@ -168,7 +169,7 @@ func (r *runner) run() error { dataStream := fmt.Sprintf( "%s-%s-%s", ds.Inputs[0].Streams[0].DataStream.Type, - ds.Inputs[0].Streams[0].DataStream.DataStream, + ds.Inputs[0].Streams[0].DataStream.Dataset, ds.Namespace, ) @@ -238,10 +239,22 @@ func (r *runner) run() error { } func (r *runner) tearDown() { + if logger.IsDebugMode() { + // Sleep to give some time for humans to scrutinize the current + // state of the system. + sleepFor := 30 * time.Second + logger.Debugf("waiting for %s before tearing down...", sleepFor) + time.Sleep(sleepFor) + } + if r.resetAgentPolicyHandler != nil { r.resetAgentPolicyHandler() } + if r.deleteTestPolicyHandler != nil { + r.deleteTestPolicyHandler() + } + if r.shutdownServiceHandler != nil { r.shutdownServiceHandler() } @@ -300,8 +313,8 @@ func createPackageDatastream( ID: fmt.Sprintf("%s-%s.%s", streamInput, pkg.Name, ds.Name), Enabled: true, DataStream: ingestmanager.DataStream{ - Type: ds.Type, - DataStream: fmt.Sprintf("%s.%s", pkg.Name, ds.Name), + Type: ds.Type, + Dataset: fmt.Sprintf("%s.%s", pkg.Name, ds.Name), }, }, } diff --git a/internal/testrunner/runners/system/servicedeployer/compose.go b/internal/testrunner/runners/system/servicedeployer/compose.go index bd8fdce13..34622b2be 100644 --- a/internal/testrunner/runners/system/servicedeployer/compose.go +++ b/internal/testrunner/runners/system/servicedeployer/compose.go @@ -95,6 +95,11 @@ func (r *DockerComposeServiceDeployer) SetUp(inCtxt ServiceContext) (DeployedSer outCtxt.Ports[idx] = port.InternalPort } + // Shortcut to first port for convenience + if len(outCtxt.Ports) > 0 { + outCtxt.Port = outCtxt.Ports[0] + } + service.ctxt = outCtxt return &service, nil } diff --git a/internal/testrunner/runners/system/servicedeployer/context.go b/internal/testrunner/runners/system/servicedeployer/context.go index 0ee1a504f..c4e968ae8 100644 --- a/internal/testrunner/runners/system/servicedeployer/context.go +++ b/internal/testrunner/runners/system/servicedeployer/context.go @@ -21,6 +21,10 @@ type ServiceContext struct { // from the Agent container. Ports []int + // Port points to the first port in the list of ports. It's provided as + // a convenient shortcut as most services tend to listen on a single port. + Port int + // Logs contains folder paths for log files produced by the service. Logs struct { Folder struct { diff --git a/internal/testrunner/runners/system/servicedeployer/factory.go b/internal/testrunner/runners/system/servicedeployer/factory.go index 734fc6c5e..5527b3a61 100644 --- a/internal/testrunner/runners/system/servicedeployer/factory.go +++ b/internal/testrunner/runners/system/servicedeployer/factory.go @@ -22,7 +22,7 @@ func Factory(packageRootPath string) (ServiceDeployer, error) { packageDevPath := filepath.Join(packageRootPath, "_dev") // Is the service defined using a docker compose configuration file? - dockerComposeYMLPath := filepath.Join(packageDevPath, "deploy", "docker-compose.yml") + dockerComposeYMLPath := filepath.Join(packageDevPath, "deploy", "docker", "docker-compose.yml") if _, err := os.Stat(dockerComposeYMLPath); err == nil { return NewDockerComposeServiceDeployer(dockerComposeYMLPath) } diff --git a/test/packages/apache/_dev/deploy/docker/Dockerfile b/test/packages/apache/_dev/deploy/docker/Dockerfile new file mode 100644 index 000000000..16a87baed --- /dev/null +++ b/test/packages/apache/_dev/deploy/docker/Dockerfile @@ -0,0 +1,6 @@ +ARG SERVICE_VERSION=${SERVICE_VERSION:-2.4.20} +FROM httpd:$SERVICE_VERSION +RUN sed -i "/jessie-updates/d" /etc/apt/sources.list +RUN apt-get update && apt-get install -y curl +HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost +COPY ./httpd.conf /usr/local/apache2/conf/httpd.conf \ No newline at end of file diff --git a/test/packages/apache/_dev/deploy/docker/docker-compose.yml b/test/packages/apache/_dev/deploy/docker/docker-compose.yml new file mode 100644 index 000000000..6feb176f9 --- /dev/null +++ b/test/packages/apache/_dev/deploy/docker/docker-compose.yml @@ -0,0 +1,11 @@ +version: '2.3' +services: + apache: + # Commented out `image:` below until we have a process to refresh the hosted images from + # Dockerfiles in this repo. Until then, we build the image locally using `build:` below. + # image: docker.elastic.co/integrations-ci/beats-apache:${SERVICE_VERSION:-2.4.20}-1 + build: . + ports: + - 80 + volumes: + - ${SERVICE_LOGS_DIR}:/usr/local/apache2/logs diff --git a/test/packages/apache/_dev/deploy/docker/httpd.conf b/test/packages/apache/_dev/deploy/docker/httpd.conf new file mode 100644 index 000000000..4f888eb2c --- /dev/null +++ b/test/packages/apache/_dev/deploy/docker/httpd.conf @@ -0,0 +1,510 @@ +# +# This is the main Apache HTTP server configuration file. It contains the +# configuration directives that give the server its instructions. +# See for detailed information. +# In particular, see +# +# for a discussion of each configuration directive. +# +# Do NOT simply read the instructions in here without understanding +# what they do. They're here only as hints or reminders. If you are unsure +# consult the online docs. You have been warned. +# +# Configuration and logfile names: If the filenames you specify for many +# of the server's control files begin with "/" (or "drive:/" for Win32), the +# server will use that explicit path. If the filenames do *not* begin +# with "/", the value of ServerRoot is prepended -- so "logs/access_log" +# with ServerRoot set to "/usr/local/apache2" will be interpreted by the +# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log" +# will be interpreted as '/logs/access_log'. + +# +# ServerRoot: The top of the directory tree under which the server's +# configuration, error, and log files are kept. +# +# Do not add a slash at the end of the directory path. If you point +# ServerRoot at a non-local disk, be sure to specify a local disk on the +# Mutex directive, if file-based mutexes are used. If you wish to share the +# same ServerRoot for multiple httpd daemons, you will need to change at +# least PidFile. +# +ServerRoot "/usr/local/apache2" + +# +# Mutex: Allows you to set the mutex mechanism and mutex file directory +# for individual mutexes, or change the global defaults +# +# Uncomment and change the directory if mutexes are file-based and the default +# mutex file directory is not on a local disk or is not appropriate for some +# other reason. +# +# Mutex default:logs + +# +# Listen: Allows you to bind Apache to specific IP addresses and/or +# ports, instead of the default. See also the +# directive. +# +# Change this to Listen on specific IP addresses as shown below to +# prevent Apache from glomming onto all bound IP addresses. +# +#Listen 12.34.56.78:80 +Listen 80 + +# +# Dynamic Shared Object (DSO) Support +# +# To be able to use the functionality of a module which was built as a DSO you +# have to place corresponding `LoadModule' lines at this location so the +# directives contained in it are actually available _before_ they are used. +# Statically compiled modules (those listed by `httpd -l') do not need +# to be loaded here. +# +# Example: +# LoadModule foo_module modules/mod_foo.so +# +LoadModule authn_file_module modules/mod_authn_file.so +#LoadModule authn_dbm_module modules/mod_authn_dbm.so +#LoadModule authn_anon_module modules/mod_authn_anon.so +#LoadModule authn_dbd_module modules/mod_authn_dbd.so +#LoadModule authn_socache_module modules/mod_authn_socache.so +LoadModule authn_core_module modules/mod_authn_core.so +LoadModule authz_host_module modules/mod_authz_host.so +LoadModule authz_groupfile_module modules/mod_authz_groupfile.so +LoadModule authz_user_module modules/mod_authz_user.so +#LoadModule authz_dbm_module modules/mod_authz_dbm.so +#LoadModule authz_owner_module modules/mod_authz_owner.so +#LoadModule authz_dbd_module modules/mod_authz_dbd.so +LoadModule authz_core_module modules/mod_authz_core.so +#LoadModule authnz_ldap_module modules/mod_authnz_ldap.so +LoadModule access_compat_module modules/mod_access_compat.so +LoadModule auth_basic_module modules/mod_auth_basic.so +#LoadModule auth_form_module modules/mod_auth_form.so +#LoadModule auth_digest_module modules/mod_auth_digest.so +#LoadModule allowmethods_module modules/mod_allowmethods.so +#LoadModule file_cache_module modules/mod_file_cache.so +#LoadModule cache_module modules/mod_cache.so +#LoadModule cache_disk_module modules/mod_cache_disk.so +#LoadModule cache_socache_module modules/mod_cache_socache.so +#LoadModule socache_shmcb_module modules/mod_socache_shmcb.so +#LoadModule socache_dbm_module modules/mod_socache_dbm.so +#LoadModule socache_memcache_module modules/mod_socache_memcache.so +#LoadModule macro_module modules/mod_macro.so +#LoadModule dbd_module modules/mod_dbd.so +#LoadModule dumpio_module modules/mod_dumpio.so +#LoadModule buffer_module modules/mod_buffer.so +#LoadModule ratelimit_module modules/mod_ratelimit.so +LoadModule reqtimeout_module modules/mod_reqtimeout.so +#LoadModule ext_filter_module modules/mod_ext_filter.so +#LoadModule request_module modules/mod_request.so +#LoadModule include_module modules/mod_include.so +LoadModule filter_module modules/mod_filter.so +#LoadModule substitute_module modules/mod_substitute.so +#LoadModule sed_module modules/mod_sed.so +#LoadModule deflate_module modules/mod_deflate.so +LoadModule mime_module modules/mod_mime.so +#LoadModule ldap_module modules/mod_ldap.so +LoadModule log_config_module modules/mod_log_config.so +#LoadModule log_debug_module modules/mod_log_debug.so +#LoadModule logio_module modules/mod_logio.so +LoadModule env_module modules/mod_env.so +#LoadModule expires_module modules/mod_expires.so +LoadModule headers_module modules/mod_headers.so +#LoadModule unique_id_module modules/mod_unique_id.so +LoadModule setenvif_module modules/mod_setenvif.so +LoadModule version_module modules/mod_version.so +#LoadModule remoteip_module modules/mod_remoteip.so +#LoadModule proxy_module modules/mod_proxy.so +#LoadModule proxy_connect_module modules/mod_proxy_connect.so +#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so +#LoadModule proxy_http_module modules/mod_proxy_http.so +#LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so +#LoadModule proxy_scgi_module modules/mod_proxy_scgi.so +#LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so +#LoadModule proxy_ajp_module modules/mod_proxy_ajp.so +#LoadModule proxy_balancer_module modules/mod_proxy_balancer.so +#LoadModule proxy_express_module modules/mod_proxy_express.so +#LoadModule session_module modules/mod_session.so +#LoadModule session_cookie_module modules/mod_session_cookie.so +#LoadModule session_crypto_module modules/mod_session_crypto.so +#LoadModule session_dbd_module modules/mod_session_dbd.so +#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so +#LoadModule ssl_module modules/mod_ssl.so +#LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so +#LoadModule lbmethod_bytraffic_module modules/mod_lbmethod_bytraffic.so +#LoadModule lbmethod_bybusyness_module modules/mod_lbmethod_bybusyness.so +#LoadModule lbmethod_heartbeat_module modules/mod_lbmethod_heartbeat.so +LoadModule unixd_module modules/mod_unixd.so +#LoadModule dav_module modules/mod_dav.so +LoadModule status_module modules/mod_status.so +LoadModule autoindex_module modules/mod_autoindex.so +#LoadModule info_module modules/mod_info.so +#LoadModule cgid_module modules/mod_cgid.so +#LoadModule dav_fs_module modules/mod_dav_fs.so +#LoadModule vhost_alias_module modules/mod_vhost_alias.so +#LoadModule negotiation_module modules/mod_negotiation.so +LoadModule dir_module modules/mod_dir.so +#LoadModule actions_module modules/mod_actions.so +#LoadModule speling_module modules/mod_speling.so +#LoadModule userdir_module modules/mod_userdir.so +LoadModule alias_module modules/mod_alias.so +#LoadModule rewrite_module modules/mod_rewrite.so + + +# +# If you wish httpd to run as a different user or group, you must run +# httpd as root initially and it will switch. +# +# User/Group: The name (or #number) of the user/group to run httpd as. +# It is usually good practice to create a dedicated user and group for +# running httpd, as with most system services. +# +User daemon +Group daemon + + + +# 'Main' server configuration +# +# The directives in this section set up the values used by the 'main' +# server, which responds to any requests that aren't handled by a +# definition. These values also provide defaults for +# any containers you may define later in the file. +# +# All of these directives may appear inside containers, +# in which case these default settings will be overridden for the +# virtual host being defined. +# + +# +# ServerAdmin: Your address, where problems with the server should be +# e-mailed. This address appears on some server-generated pages, such +# as error documents. e.g. admin@your-domain.com +# +ServerAdmin you@example.com + +# +# ServerName gives the name and port that the server uses to identify itself. +# This can often be determined automatically, but we recommend you specify +# it explicitly to prevent problems during startup. +# +# If your host doesn't have a registered DNS name, enter its IP address here. +# +#ServerName www.example.com:80 + +# +# Deny access to the entirety of your server's filesystem. You must +# explicitly permit access to web content directories in other +# blocks below. +# + + AllowOverride none + Require all denied + + +# +# Note that from this point forward you must specifically allow +# particular features to be enabled - so if something's not working as +# you might expect, make sure that you have specifically enabled it +# below. +# + +# +# DocumentRoot: The directory out of which you will serve your +# documents. By default, all requests are taken from this directory, but +# symbolic links and aliases may be used to point to other locations. +# +DocumentRoot "/usr/local/apache2/htdocs" + + # + # Possible values for the Options directive are "None", "All", + # or any combination of: + # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews + # + # Note that "MultiViews" must be named *explicitly* --- "Options All" + # doesn't give it to you. + # + # The Options directive is both complicated and important. Please see + # http://httpd.apache.org/docs/2.4/mod/core.html#options + # for more information. + # + Options Indexes FollowSymLinks + + # + # AllowOverride controls what directives may be placed in .htaccess files. + # It can be "All", "None", or any combination of the keywords: + # AllowOverride FileInfo AuthConfig Limit + # + AllowOverride None + + # + # Controls who can get stuff from this server. + # + Require all granted + + +# +# DirectoryIndex: sets the file that Apache will serve if a directory +# is requested. +# + + DirectoryIndex index.html + + +# +# The following lines prevent .htaccess and .htpasswd files from being +# viewed by Web clients. +# + + Require all denied + + +# +# ErrorLog: The location of the error log file. +# If you do not specify an ErrorLog directive within a +# container, error messages relating to that virtual host will be +# logged here. If you *do* define an error logfile for a +# container, that host's errors will be logged there and not here. +# +ErrorLog "/usr/local/apache2/logs/error.log" + +# +# LogLevel: Control the number of messages logged to the error_log. +# Possible values include: debug, info, notice, warn, error, crit, +# alert, emerg. +# +LogLevel warn + + + # + # The following directives define some format nicknames for use with + # a CustomLog directive (see below). + # + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined + LogFormat "%h %l %u %t \"%r\" %>s %b" common + + + # You need to enable mod_logio.c to use %I and %O + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio + + + # + # The location and format of the access logfile (Common Logfile Format). + # If you do not define any access logfiles within a + # container, they will be logged here. Contrariwise, if you *do* + # define per- access logfiles, transactions will be + # logged therein and *not* in this file. + # + CustomLog "/usr/local/apache2/logs/access.log" common + + # + # If you prefer a logfile with access, agent, and referer information + # (Combined Logfile Format) you can use the following directive. + # + #CustomLog "logs/access_log" combined + + + + # + # Redirect: Allows you to tell clients about documents that used to + # exist in your server's namespace, but do not anymore. The client + # will make a new request for the document at its new location. + # Example: + # Redirect permanent /foo http://www.example.com/bar + + # + # Alias: Maps web paths into filesystem paths and is used to + # access content that does not live under the DocumentRoot. + # Example: + # Alias /webpath /full/filesystem/path + # + # If you include a trailing / on /webpath then the server will + # require it to be present in the URL. You will also likely + # need to provide a section to allow access to + # the filesystem path. + + # + # ScriptAlias: This controls which directories contain server scripts. + # ScriptAliases are essentially the same as Aliases, except that + # documents in the target directory are treated as applications and + # run by the server when requested rather than as documents sent to the + # client. The same rules about trailing "/" apply to ScriptAlias + # directives as to Alias. + # + ScriptAlias /cgi-bin/ "/usr/local/apache2/cgi-bin/" + + + + + # + # ScriptSock: On threaded servers, designate the path to the UNIX + # socket used to communicate with the CGI daemon of mod_cgid. + # + #Scriptsock cgisock + + +# +# "/usr/local/apache2/cgi-bin" should be changed to whatever your ScriptAliased +# CGI directory exists, if you have that configured. +# + + AllowOverride None + Options None + Require all granted + + + + # + # TypesConfig points to the file containing the list of mappings from + # filename extension to MIME-type. + # + TypesConfig conf/mime.types + + # + # AddType allows you to add to or override the MIME configuration + # file specified in TypesConfig for specific file types. + # + #AddType application/x-gzip .tgz + # + # AddEncoding allows you to have certain browsers uncompress + # information on the fly. Note: Not all browsers support this. + # + #AddEncoding x-compress .Z + #AddEncoding x-gzip .gz .tgz + # + # If the AddEncoding directives above are commented-out, then you + # probably should define those extensions to indicate media types: + # + AddType application/x-compress .Z + AddType application/x-gzip .gz .tgz + + # + # AddHandler allows you to map certain file extensions to "handlers": + # actions unrelated to filetype. These can be either built into the server + # or added with the Action directive (see below) + # + # To use CGI scripts outside of ScriptAliased directories: + # (You will also need to add "ExecCGI" to the "Options" directive.) + # + #AddHandler cgi-script .cgi + + # For type maps (negotiated resources): + #AddHandler type-map var + + # + # Filters allow you to process content before it is sent to the client. + # + # To parse .shtml files for server-side includes (SSI): + # (You will also need to add "Includes" to the "Options" directive.) + # + #AddType text/html .shtml + #AddOutputFilter INCLUDES .shtml + + +# +# The mod_mime_magic module allows the server to use various hints from the +# contents of the file itself to determine its type. The MIMEMagicFile +# directive tells the module where the hint definitions are located. +# +#MIMEMagicFile conf/magic + +# +# Customizable error responses come in three flavors: +# 1) plain text 2) local redirects 3) external redirects +# +# Some examples: +#ErrorDocument 500 "The server made a boo boo." +#ErrorDocument 404 /missing.html +#ErrorDocument 404 "/cgi-bin/missing_handler.pl" +#ErrorDocument 402 http://www.example.com/subscription_info.html +# + +# +# MaxRanges: Maximum number of Ranges in a request before +# returning the entire resource, or one of the special +# values 'default', 'none' or 'unlimited'. +# Default setting is to accept 200 Ranges. +#MaxRanges unlimited + +# +# EnableMMAP and EnableSendfile: On systems that support it, +# memory-mapping or the sendfile syscall may be used to deliver +# files. This usually improves server performance, but must +# be turned off when serving from networked-mounted +# filesystems or if support for these functions is otherwise +# broken on your system. +# Defaults: EnableMMAP On, EnableSendfile Off +# +#EnableMMAP off +#EnableSendfile on + +# Supplemental configuration +# +# The configuration files in the conf/extra/ directory can be +# included to add extra features or to modify the default configuration of +# the server, or you may simply copy their contents here and change as +# necessary. + +# Server-pool management (MPM specific) +#Include conf/extra/httpd-mpm.conf + +# Multi-language error messages +#Include conf/extra/httpd-multilang-errordoc.conf + +# Fancy directory listings +#Include conf/extra/httpd-autoindex.conf + +# Language settings +#Include conf/extra/httpd-languages.conf + +# User home directories +#Include conf/extra/httpd-userdir.conf + +# Real-time info on requests and configuration +#Include conf/extra/httpd-info.conf + +# Virtual hosts +#Include conf/extra/httpd-vhosts.conf + +# Local access to the Apache HTTP Server Manual +#Include conf/extra/httpd-manual.conf + +# Distributed authoring and versioning (WebDAV) +#Include conf/extra/httpd-dav.conf + +# Various default settings +#Include conf/extra/httpd-default.conf + +# Configure mod_proxy_html to understand HTML4/XHTML1 + +Include conf/extra/proxy-html.conf + + +# Secure (SSL/TLS) connections +#Include conf/extra/httpd-ssl.conf +# +# Note: The following must must be present to support +# starting without SSL on platforms with no /dev/random equivalent +# but a statically compiled-in mod_ssl. +# + +SSLRandomSeed startup builtin +SSLRandomSeed connect builtin + + + + + + SetHandler server-status + + + # Keep track of extended status information for each request + ExtendedStatus On + + + # Show Proxy LoadBalancer status in mod_status + ProxyStatus On + + + + \ No newline at end of file diff --git a/test/packages/apache/_dev/deploy/variants.yml b/test/packages/apache/_dev/deploy/variants.yml new file mode 100644 index 000000000..e0cf463cf --- /dev/null +++ b/test/packages/apache/_dev/deploy/variants.yml @@ -0,0 +1,4 @@ +variants: + v2: + SERVICE_VERSION: 2.4.20 +default: v2 diff --git a/test/packages/apache/data_stream/access/_dev/test/system/config.yml b/test/packages/apache/data_stream/access/_dev/test/system/config.yml new file mode 100644 index 000000000..0f73c5dd9 --- /dev/null +++ b/test/packages/apache/data_stream/access/_dev/test/system/config.yml @@ -0,0 +1,5 @@ +vars: ~ +data_stream: + vars: + paths: + - "{{SERVICE_LOGS_DIR}}/access.log*" diff --git a/test/packages/apache/data_stream/error/_dev/test/system/config.yml b/test/packages/apache/data_stream/error/_dev/test/system/config.yml new file mode 100644 index 000000000..ec7356ee9 --- /dev/null +++ b/test/packages/apache/data_stream/error/_dev/test/system/config.yml @@ -0,0 +1,5 @@ +vars: ~ +data_stream: + vars: + paths: + - "{{SERVICE_LOGS_DIR}}/error.log*" diff --git a/test/packages/apache/data_stream/status/_dev/test/system/config.yml b/test/packages/apache/data_stream/status/_dev/test/system/config.yml new file mode 100644 index 000000000..83fc84f62 --- /dev/null +++ b/test/packages/apache/data_stream/status/_dev/test/system/config.yml @@ -0,0 +1,5 @@ +vars: + hosts: + - http://{{Hostname}}:{{Port}} +data_stream: + vars: ~