Skip to content

Commit 95796e4

Browse files
foxdalasfoxdalas
committed
fix exporter for version 2,3,4
1 parent b0a19c3 commit 95796e4

11 files changed

+269
-5
lines changed

‎docker-compose-2.yml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
version: "3.9"
2+
services:
3+
# exporter:
4+
# container_name: exporter
5+
# command:
6+
# - "--sphinx.address=sphinx"
7+
# - "--sphinx.port=3306"
8+
# build:
9+
# context: .
10+
# dockerfile: Dockerfile.compose
11+
# ports:
12+
# - "9247:9247"
13+
sphinx:
14+
container_name: sphinx
15+
build:
16+
context: tests/sphinx-2
17+
ports:
18+
- "3306:3306"
19+
20+

‎docker-compose-3.4.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ services:
1313
sphinx:
1414
container_name: sphinx
1515
build:
16-
context: tests/sphinx
16+
context: tests/sphinx-3
1717
ports:
1818
- "3306:3306"
1919

‎main.go

+13-4
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,18 @@ func NewExporter(server string, port string, timeout time.Duration) *Exporter {
104104
variables[variableName] = variableValue
105105
}
106106

107-
version, err := semver.NewVersion(strings.Split(variables["version"], " ")[0])
108-
if err != nil {
109-
log.Fatal(err)
107+
var version *semver.Version
108+
109+
if len(variables["version"]) == 0 {
110+
version, err = semver.NewVersion("2.0")
111+
if err != nil {
112+
log.Fatal(err)
113+
}
114+
} else {
115+
version, err = semver.NewVersion(strings.Split(variables["version"], " ")[0])
116+
if err != nil {
117+
log.Fatal(err)
118+
}
110119
}
111120

112121
return &Exporter{
@@ -646,7 +655,7 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {
646655
tid, proto, state, time, info string
647656
)
648657
err = threads_rows.Scan(
649-
&tid, &proto, &state, &state, &time, &info,
658+
&tid, &proto, &state, &time, &info,
650659
)
651660
if err != nil {
652661
log.Error(err)

‎tests/sphinx-2/Dockerfile

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
FROM ubuntu:xenial
2+
MAINTAINER romeOz <[email protected]>
3+
4+
ENV OS_LOCALE="en_US.UTF-8" \
5+
OS_LANGUAGE="en_US:en" \
6+
SPHINX_LOG_DIR=/var/log/sphinxsearch \
7+
SPHINX_CONF=/etc/sphinxsearch/sphinx.conf \
8+
SPHINX_RUN=/run/sphinxsearch/searchd.pid \
9+
SPHINX_DATA_DIR=/var/lib/sphinxsearch/data
10+
11+
RUN buildDeps='software-properties-common python-software-properties' \
12+
&& apt-get update && apt-get install -y $buildDeps locales --no-install-recommends \
13+
&& add-apt-repository -y ppa:builds/sphinxsearch-rel22 \
14+
&& apt-get update \
15+
&& apt-get install -y sudo sphinxsearch \
16+
&& mv -f /etc/sphinxsearch/sphinx.conf /etc/sphinxsearch/origin.sphinx.conf \
17+
&& apt-get purge -y --auto-remove $buildDeps \
18+
&& rm -rf /var/lib/apt/lists/* \
19+
# Forward sphinx logs to docker log collector
20+
&& ln -sf /dev/stdout ${SPHINX_LOG_DIR}/searchd.log \
21+
&& ln -sf /dev/stdout ${SPHINX_LOG_DIR}/query.log
22+
23+
# Set the locale
24+
RUN locale-gen ${OS_LOCALE}
25+
ENV LANG=${OS_LOCALE} \
26+
LANGUAGE=${OS_LANGUAGE} \
27+
LC_ALL=${OS_LOCALE}
28+
29+
COPY ./entrypoint.sh /sbin/entrypoint.sh
30+
RUN chmod 755 /sbin/entrypoint.sh
31+
RUN mkdir -p /var/lib/sphinxsearch/index/
32+
33+
COPY ./sphinx.conf /etc/sphinxsearch/
34+
35+
COPY ./docs.xml /opt/
36+
37+
RUN indexer --all --config "/etc/sphinxsearch/sphinx.conf"
38+
39+
40+
EXPOSE 3306
41+
VOLUME ["${SPHINX_DATA_DIR}"]
42+
ENTRYPOINT ["/sbin/entrypoint.sh"]

‎tests/sphinx-2/docs.xml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- http://sphinxsearch.com/docs/current/xmlpipe2.html -->
3+
<sphinx:docset>
4+
<sphinx:schema>
5+
<sphinx:field name="subject"/>
6+
<sphinx:field name="content"/>
7+
</sphinx:schema>
8+
<sphinx:document id="1234">
9+
<content>this is the main content <![CDATA[[and this <cdata> entry
10+
must be handled properly by xml parser lib]]></content>
11+
<published>1012325463</published>
12+
<subject>note how field/attr tags can be
13+
in <b class="red">randomized</b> order</subject>
14+
<misc>some undeclared element</misc>
15+
</sphinx:document>
16+
<sphinx:document id="1235">
17+
<subject>another subject</subject>
18+
<content>here comes another document, and i am given to understand,
19+
that in-document field order must not matter, sir</content>
20+
<published>1012325467</published>
21+
</sphinx:document>
22+
</sphinx:docset>

‎tests/sphinx-2/entrypoint.sh

+130
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
#!/bin/bash
2+
set -e
3+
4+
SPHINX_MODE=${SPHINX_MODE:-}
5+
SPHINX_BACKUP_DIR=${SPHINX_BACKUP_DIR:-"/tmp/backup"}
6+
SPHINX_BACKUP_FILENAME=${SPHINX_BACKUP_FILENAME:-"backup.last.tar.gz"}
7+
SPHINX_RESTORE=${SPHINX_RESTORE:-}
8+
SPHINX_CHECK=${SPHINX_CHECK:-}
9+
INDEX_NAME=${INDEX_NAME:-}
10+
SPHINX_ROTATE_BACKUP=${SPHINX_ROTATE_BACKUP:-true}
11+
12+
create_backup_dir() {
13+
if [[ ! -d ${SPHINX_BACKUP_DIR}/ ]]; then
14+
mkdir -p ${SPHINX_BACKUP_DIR}/
15+
fi
16+
chmod -R 0755 ${SPHINX_BACKUP_DIR}
17+
}
18+
19+
create_data_dir() {
20+
mkdir -p ${SPHINX_DATA_DIR}
21+
chmod -R 0700 ${SPHINX_DATA_DIR}
22+
}
23+
24+
rotate_backup()
25+
{
26+
echo "Rotate backup..."
27+
28+
if [[ ${SPHINX_ROTATE_BACKUP} == true ]]; then
29+
WEEK=$(date +"%V")
30+
MONTH=$(date +"%b")
31+
let "INDEX = WEEK % 5" || true
32+
if [[ ${INDEX} == 0 ]]; then
33+
INDEX=4
34+
fi
35+
36+
test -e ${SPHINX_BACKUP_DIR}/backup.${INDEX}.tar.gz && rm ${SPHINX_BACKUP_DIR}/backup.${INDEX}.tar.gz
37+
mv ${SPHINX_BACKUP_DIR}/backup.tar.gz ${SPHINX_BACKUP_DIR}/backup.${INDEX}.tar.gz
38+
echo "Create backup file: ${SPHINX_BACKUP_DIR}/backup.${INDEX}.tar.gz"
39+
40+
test -e ${SPHINX_BACKUP_DIR}/backup.${MONTH}.tar.gz && rm ${SPHINX_BACKUP_DIR}/backup.${MONTH}.tar.gz
41+
ln ${SPHINX_BACKUP_DIR}/backup.${INDEX}.tar.gz ${SPHINX_BACKUP_DIR}/backup.${MONTH}.tar.gz
42+
echo "Create backup file: ${SPHINX_BACKUP_DIR}/backup.${MONTH}.tar.gz"
43+
44+
test -e ${SPHINX_BACKUP_DIR}/backup.last.tar.gz && rm ${SPHINX_BACKUP_DIR}/backup.last.tar.gz
45+
ln ${SPHINX_BACKUP_DIR}/backup.${INDEX}.tar.gz ${SPHINX_BACKUP_DIR}/backup.last.tar.gz
46+
echo "Create backup file: ${SPHINX_BACKUP_DIR}/backup.last.tar.gz"
47+
else
48+
mv ${SPHINX_BACKUP_DIR}/backup.tar.gz ${SPHINX_BACKUP_DIR}/backup.last.tar.gz
49+
echo "Create backup file: ${SPHINX_BACKUP_DIR}/backup.last.tar.gz"
50+
fi
51+
}
52+
53+
import_backup()
54+
{
55+
echo "Import dump..."
56+
FILE=$1
57+
if [[ ${FILE} == default ]]; then
58+
FILE="${SPHINX_BACKUP_DIR}/${SPHINX_BACKUP_FILENAME}"
59+
fi
60+
if [[ ! -f "${FILE}" ]]; then
61+
echo "Unknown backup: ${FILE}"
62+
exit 1
63+
fi
64+
create_data_dir
65+
tar -C ${SPHINX_DATA_DIR} -xf ${FILE}
66+
}
67+
68+
sed -i "s~SPHINX_DATA_DIR~${SPHINX_DATA_DIR}~g" ${SPHINX_CONF}
69+
sed -i "s~SPHINX_LOG_DIR~${SPHINX_LOG_DIR}~g" ${SPHINX_CONF}
70+
sed -i "s~SPHINX_RUN~${SPHINX_RUN}~g" ${SPHINX_CONF}
71+
72+
if [[ ${SPHINX_MODE} == indexing ]]; then
73+
indexer --config ${SPHINX_CONF} --all
74+
fi
75+
76+
if [[ ${SPHINX_MODE} == backup ]]; then
77+
echo "Backup..."
78+
if [[ ! -d ${SPHINX_DATA_DIR} ]]; then
79+
echo "No such directory: ${SPHINX_DATA_DIR}"
80+
exit 1
81+
fi
82+
create_backup_dir
83+
cd ${SPHINX_DATA_DIR}
84+
tar --ignore-failed-read -zcvf ${SPHINX_BACKUP_DIR}/backup.tar.gz *.sp* *.ram *.kill *.meta binlog.*
85+
cd -
86+
rotate_backup
87+
exit 0
88+
fi
89+
90+
# Restore from backup
91+
if [[ -n ${SPHINX_RESTORE} ]]; then
92+
import_backup ${SPHINX_RESTORE}
93+
fi
94+
95+
# Check backup
96+
if [[ -n ${SPHINX_CHECK} ]]; then
97+
98+
echo "Check backup..."
99+
if [[ -z ${INDEX_NAME} ]]; then
100+
echo "Unknown database. INDEX_NAME does not null"
101+
exit 1;
102+
fi
103+
104+
if [[ ! -d ${SPHINX_DATA_DIR} || -z $(ls -A ${SPHINX_DATA_DIR}) ]]; then
105+
import_backup ${SPHINX_CHECK}
106+
fi
107+
108+
if [[ $(indextool --config ${SPHINX_CONF} --check ${INDEX_NAME} | grep -w "check passed") ]]; then
109+
echo "Success checking backup"
110+
else
111+
echo "Fail checking backup"
112+
exit 1
113+
fi
114+
115+
exit 0
116+
fi
117+
118+
# allow arguments to be passed to Sphinx search
119+
if [[ ${1:0:1} = '-' ]]; then
120+
EXTRA_OPTS="$@"
121+
set --
122+
fi
123+
124+
# default behaviour is to launch Sphinx search
125+
if [[ -z ${1} ]]; then
126+
echo "Starting Sphinx search demon..."
127+
exec $(which searchd) --config ${SPHINX_CONF} --nodetach ${EXTRA_OPTS}
128+
else
129+
exec "$@"
130+
fi

‎tests/sphinx-2/sphinx.conf

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
source xml
2+
{
3+
type = xmlpipe2
4+
xmlpipe_fixup_utf8 = 1
5+
xmlpipe_command = cat /opt/docs.xml
6+
}
7+
8+
index test_index
9+
{
10+
source = xml
11+
path = /var/lib/sphinxsearch/index/test_index
12+
13+
# @see http://sphinxsearch.com/docs/2.0.1/conf-blend-chars.html
14+
blend_chars = -
15+
16+
# CALL SUGGEST
17+
min_infix_len = 3
18+
19+
# wsparcie dla polskich znaków
20+
# @see http://sphinxsearch.com/wiki/doku.php?id=charset_tables#polish
21+
charset_table = 0..9, A..Z->a..z, a..z, U+0143->U+0144, U+0104->U+0105, U+0106->U+0107, U+0118->U+0119, U+0141->U+0142, U+00D3->U+00F3, U+015A->U+015B, U+0179->U+017A, U+017B->U+017C, U+0105, U+0107, U+0119, U+0142, U+00F3, U+015B, U+017A, U+017C, U+0144
22+
}
23+
24+
indexer
25+
{
26+
mem_limit = 256M
27+
}
28+
29+
searchd
30+
{
31+
listen = 3306:mysql41
32+
log = /var/log/searchd.log
33+
query_log = /var/log/query.log
34+
query_log_format = sphinxql
35+
pid_file = SPHINX_RUN
36+
37+
# binlogs
38+
binlog_path = # disable logging
39+
}

‎tests/sphinx/Dockerfile ‎tests/sphinx-3/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ RUN apk add --no-cache mariadb-connector-c-dev \
1010
postgresql-dev \
1111
wget
1212

13+
http://sphinxsearch.com/downloads/sphinx-2.3.2-beta.tar.gz/thankyou.html
14+
1315
# set up and expose directories
1416
RUN mkdir -pv /opt/sphinx/log /opt/sphinx/index
1517
VOLUME /opt/sphinx/index

‎tests/sphinx/docs.xml ‎tests/sphinx-3/docs.xml

File renamed without changes.

‎tests/sphinx/run.sh ‎tests/sphinx-3/run.sh

File renamed without changes.

‎tests/sphinx/sphinx.conf ‎tests/sphinx-3/sphinx.conf

File renamed without changes.

0 commit comments

Comments
 (0)