Merge remote-tracking branch 'origin/develop' into feature/os
This commit is contained in:
Shengliang Guan
commit
169a17bcb3
|
|
@ -1,3 +1,6 @@
|
||||||
[submodule "src/connector/go"]
|
[submodule "src/connector/go"]
|
||||||
path = src/connector/go
|
path = src/connector/go
|
||||||
url = https://github.com/taosdata/driver-go
|
url = https://github.com/taosdata/driver-go
|
||||||
|
[submodule "src/connector/grafanaplugin"]
|
||||||
|
path = src/connector/grafanaplugin
|
||||||
|
url = https://github.com/taosdata/grafanaplugin
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,7 @@ SET(TD_COVER FALSE)
|
||||||
SET(TD_MEM_CHECK FALSE)
|
SET(TD_MEM_CHECK FALSE)
|
||||||
|
|
||||||
SET(TD_PAGMODE_LITE FALSE)
|
SET(TD_PAGMODE_LITE FALSE)
|
||||||
|
SET(TD_SOMODE_STATIC FALSE)
|
||||||
SET(TD_GODLL FALSE)
|
SET(TD_GODLL FALSE)
|
||||||
|
|
||||||
SET(TD_COMMUNITY_DIR ${PROJECT_SOURCE_DIR})
|
SET(TD_COMMUNITY_DIR ${PROJECT_SOURCE_DIR})
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,11 @@ IF (${PAGMODE} MATCHES "lite")
|
||||||
MESSAGE(STATUS "Build with pagmode lite")
|
MESSAGE(STATUS "Build with pagmode lite")
|
||||||
ENDIF ()
|
ENDIF ()
|
||||||
|
|
||||||
|
IF (${SOMODE} MATCHES "static")
|
||||||
|
SET(TD_SOMODE_STATIC TRUE)
|
||||||
|
MESSAGE(STATUS "Link so using static mode")
|
||||||
|
ENDIF ()
|
||||||
|
|
||||||
IF (${DLLTYPE} MATCHES "go")
|
IF (${DLLTYPE} MATCHES "go")
|
||||||
SET(TD_GODLL TRUE)
|
SET(TD_GODLL TRUE)
|
||||||
MESSAGE(STATUS "input dll type: " ${DLLTYPE})
|
MESSAGE(STATUS "input dll type: " ${DLLTYPE})
|
||||||
|
|
|
||||||
|
|
@ -54,7 +54,7 @@ cp ${compile_dir}/build/lib/${libfile} ${pkg_dir}${install_home_pat
|
||||||
cp ${compile_dir}/../src/inc/taos.h ${pkg_dir}${install_home_path}/include
|
cp ${compile_dir}/../src/inc/taos.h ${pkg_dir}${install_home_path}/include
|
||||||
cp ${compile_dir}/../src/inc/taoserror.h ${pkg_dir}${install_home_path}/include
|
cp ${compile_dir}/../src/inc/taoserror.h ${pkg_dir}${install_home_path}/include
|
||||||
cp -r ${top_dir}/tests/examples/* ${pkg_dir}${install_home_path}/examples
|
cp -r ${top_dir}/tests/examples/* ${pkg_dir}${install_home_path}/examples
|
||||||
cp -r ${top_dir}/src/connector/grafana ${pkg_dir}${install_home_path}/connector
|
cp -r ${top_dir}/src/connector/grafanaplugin ${pkg_dir}${install_home_path}/connector
|
||||||
cp -r ${top_dir}/src/connector/python ${pkg_dir}${install_home_path}/connector
|
cp -r ${top_dir}/src/connector/python ${pkg_dir}${install_home_path}/connector
|
||||||
cp -r ${top_dir}/src/connector/go ${pkg_dir}${install_home_path}/connector
|
cp -r ${top_dir}/src/connector/go ${pkg_dir}${install_home_path}/connector
|
||||||
cp ${compile_dir}/build/lib/taos-jdbcdriver*dist.* ${pkg_dir}${install_home_path}/connector
|
cp ${compile_dir}/build/lib/taos-jdbcdriver*dist.* ${pkg_dir}${install_home_path}/connector
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ set -e
|
||||||
# -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...]
|
# -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...]
|
||||||
# -V [stable | beta]
|
# -V [stable | beta]
|
||||||
# -l [full | lite]
|
# -l [full | lite]
|
||||||
|
# -s [static | dynamic]
|
||||||
# -n [2.0.0.3]
|
# -n [2.0.0.3]
|
||||||
|
|
||||||
# set parameters by default value
|
# set parameters by default value
|
||||||
|
|
@ -18,9 +19,10 @@ verType=stable # [stable, beta]
|
||||||
cpuType=x64 # [aarch32 | aarch64 | x64 | x86 | mips64 ...]
|
cpuType=x64 # [aarch32 | aarch64 | x64 | x86 | mips64 ...]
|
||||||
osType=Linux # [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...]
|
osType=Linux # [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...]
|
||||||
pagMode=full # [full | lite]
|
pagMode=full # [full | lite]
|
||||||
|
soMode=dynamic # [static | dynamic]
|
||||||
verNumber=""
|
verNumber=""
|
||||||
|
|
||||||
while getopts "hv:V:c:o:l:n:" arg
|
while getopts "hv:V:c:o:l:s:n:" arg
|
||||||
do
|
do
|
||||||
case $arg in
|
case $arg in
|
||||||
v)
|
v)
|
||||||
|
|
@ -39,6 +41,10 @@ do
|
||||||
#echo "pagMode=$OPTARG"
|
#echo "pagMode=$OPTARG"
|
||||||
pagMode=$(echo $OPTARG)
|
pagMode=$(echo $OPTARG)
|
||||||
;;
|
;;
|
||||||
|
s)
|
||||||
|
#echo "soMode=$OPTARG"
|
||||||
|
soMode=$(echo $OPTARG)
|
||||||
|
;;
|
||||||
n)
|
n)
|
||||||
#echo "verNumber=$OPTARG"
|
#echo "verNumber=$OPTARG"
|
||||||
verNumber=$(echo $OPTARG)
|
verNumber=$(echo $OPTARG)
|
||||||
|
|
@ -53,6 +59,7 @@ do
|
||||||
echo " -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...] "
|
echo " -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...] "
|
||||||
echo " -V [stable | beta] "
|
echo " -V [stable | beta] "
|
||||||
echo " -l [full | lite] "
|
echo " -l [full | lite] "
|
||||||
|
echo " -s [static | dynamic] "
|
||||||
echo " -n [version number] "
|
echo " -n [version number] "
|
||||||
exit 0
|
exit 0
|
||||||
;;
|
;;
|
||||||
|
|
@ -63,7 +70,7 @@ do
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "verMode=${verMode} verType=${verType} cpuType=${cpuType} osType=${osType} pagMode=${pagMode} verNumber=${verNumber}"
|
echo "verMode=${verMode} verType=${verType} cpuType=${cpuType} osType=${osType} pagMode=${pagMode} soMode=${soMode} verNumber=${verNumber}"
|
||||||
|
|
||||||
curr_dir=$(pwd)
|
curr_dir=$(pwd)
|
||||||
|
|
||||||
|
|
@ -223,9 +230,9 @@ cd ${compile_dir}
|
||||||
# check support cpu type
|
# check support cpu type
|
||||||
if [[ "$cpuType" == "x64" ]] || [[ "$cpuType" == "aarch64" ]] || [[ "$cpuType" == "aarch32" ]] || [[ "$cpuType" == "mips64" ]] ; then
|
if [[ "$cpuType" == "x64" ]] || [[ "$cpuType" == "aarch64" ]] || [[ "$cpuType" == "aarch32" ]] || [[ "$cpuType" == "mips64" ]] ; then
|
||||||
if [ "$verMode" != "cluster" ]; then
|
if [ "$verMode" != "cluster" ]; then
|
||||||
cmake ../ -DCPUTYPE=${cpuType} -DPAGMODE=${pagMode}
|
cmake ../ -DCPUTYPE=${cpuType} -DPAGMODE=${pagMode} -DSOMODE=${soMode}
|
||||||
else
|
else
|
||||||
cmake ../../ -DCPUTYPE=${cpuType}
|
cmake ../../ -DCPUTYPE=${cpuType} -DSOMODE=${soMode}
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "input cpuType=${cpuType} error!!!"
|
echo "input cpuType=${cpuType} error!!!"
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ cp %{_compiledir}/build/bin/taosdemo %{buildroot}%{homepath}/bin
|
||||||
cp %{_compiledir}/build/lib/${libfile} %{buildroot}%{homepath}/driver
|
cp %{_compiledir}/build/lib/${libfile} %{buildroot}%{homepath}/driver
|
||||||
cp %{_compiledir}/../src/inc/taos.h %{buildroot}%{homepath}/include
|
cp %{_compiledir}/../src/inc/taos.h %{buildroot}%{homepath}/include
|
||||||
cp %{_compiledir}/../src/inc/taoserror.h %{buildroot}%{homepath}/include
|
cp %{_compiledir}/../src/inc/taoserror.h %{buildroot}%{homepath}/include
|
||||||
cp -r %{_compiledir}/../src/connector/grafana %{buildroot}%{homepath}/connector
|
cp -r %{_compiledir}/../src/connector/grafanaplugin %{buildroot}%{homepath}/connector
|
||||||
cp -r %{_compiledir}/../src/connector/python %{buildroot}%{homepath}/connector
|
cp -r %{_compiledir}/../src/connector/python %{buildroot}%{homepath}/connector
|
||||||
cp -r %{_compiledir}/../src/connector/go %{buildroot}%{homepath}/connector
|
cp -r %{_compiledir}/../src/connector/go %{buildroot}%{homepath}/connector
|
||||||
cp %{_compiledir}/build/lib/taos-jdbcdriver*dist.* %{buildroot}%{homepath}/connector
|
cp %{_compiledir}/build/lib/taos-jdbcdriver*dist.* %{buildroot}%{homepath}/connector
|
||||||
|
|
|
||||||
|
|
@ -446,7 +446,7 @@ function install_service_on_systemd() {
|
||||||
${csudo} bash -c "echo >> ${tarbitratord_service_config}"
|
${csudo} bash -c "echo >> ${tarbitratord_service_config}"
|
||||||
${csudo} bash -c "echo '[Install]' >> ${tarbitratord_service_config}"
|
${csudo} bash -c "echo '[Install]' >> ${tarbitratord_service_config}"
|
||||||
${csudo} bash -c "echo 'WantedBy=multi-user.target' >> ${tarbitratord_service_config}"
|
${csudo} bash -c "echo 'WantedBy=multi-user.target' >> ${tarbitratord_service_config}"
|
||||||
${csudo} systemctl enable tarbitratord
|
# ${csudo} systemctl enable tarbitratord
|
||||||
|
|
||||||
nginx_service_config="${service_config_dir}/nginxd.service"
|
nginx_service_config="${service_config_dir}/nginxd.service"
|
||||||
${csudo} bash -c "echo '[Unit]' >> ${nginx_service_config}"
|
${csudo} bash -c "echo '[Unit]' >> ${nginx_service_config}"
|
||||||
|
|
|
||||||
|
|
@ -237,7 +237,7 @@ function install_data() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function install_connector() {
|
function install_connector() {
|
||||||
${csudo} cp -rf ${source_dir}/src/connector/grafana ${install_main_dir}/connector
|
${csudo} cp -rf ${source_dir}/src/connector/grafanaplugin ${install_main_dir}/connector
|
||||||
${csudo} cp -rf ${source_dir}/src/connector/python ${install_main_dir}/connector
|
${csudo} cp -rf ${source_dir}/src/connector/python ${install_main_dir}/connector
|
||||||
${csudo} cp -rf ${source_dir}/src/connector/go ${install_main_dir}/connector
|
${csudo} cp -rf ${source_dir}/src/connector/go ${install_main_dir}/connector
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -110,7 +110,7 @@ if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
|
||||||
if [ "$osType" != "Darwin" ]; then
|
if [ "$osType" != "Darwin" ]; then
|
||||||
cp ${build_dir}/lib/*.jar ${install_dir}/connector
|
cp ${build_dir}/lib/*.jar ${install_dir}/connector
|
||||||
fi
|
fi
|
||||||
cp -r ${connector_dir}/grafana ${install_dir}/connector/
|
cp -r ${connector_dir}/grafanaplugin ${install_dir}/connector/
|
||||||
cp -r ${connector_dir}/python ${install_dir}/connector/
|
cp -r ${connector_dir}/python ${install_dir}/connector/
|
||||||
cp -r ${connector_dir}/go ${install_dir}/connector
|
cp -r ${connector_dir}/go ${install_dir}/connector
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -123,7 +123,7 @@ connector_dir="${code_dir}/connector"
|
||||||
mkdir -p ${install_dir}/connector
|
mkdir -p ${install_dir}/connector
|
||||||
if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
|
if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
|
||||||
cp ${build_dir}/lib/*.jar ${install_dir}/connector
|
cp ${build_dir}/lib/*.jar ${install_dir}/connector
|
||||||
cp -r ${connector_dir}/grafana ${install_dir}/connector/
|
cp -r ${connector_dir}/grafanaplugin ${install_dir}/connector/
|
||||||
cp -r ${connector_dir}/python ${install_dir}/connector/
|
cp -r ${connector_dir}/python ${install_dir}/connector/
|
||||||
cp -r ${connector_dir}/go ${install_dir}/connector
|
cp -r ${connector_dir}/go ${install_dir}/connector
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -327,13 +327,30 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getResultSetImp(
|
||||||
STscObj *pObj = pSql->pTscObj;
|
STscObj *pObj = pSql->pTscObj;
|
||||||
|
|
||||||
if (tscIsUpdateQuery(pSql)) {
|
if (tscIsUpdateQuery(pSql)) {
|
||||||
// taos_free_result(pSql); // free result here
|
jniDebug("jobj:%p, conn:%p, update query, no resultset, %p", jobj, pObj, (void *)tres);
|
||||||
jniDebug("jobj:%p, conn:%p, no resultset, %p", jobj, pObj, (void *)tres);
|
|
||||||
return 0;
|
|
||||||
} else {
|
} else {
|
||||||
jniDebug("jobj:%p, conn:%p, get resultset, %p", jobj, pObj, (void *)tres);
|
jniDebug("jobj:%p, conn:%p, get resultset, %p", jobj, pObj, (void *)tres);
|
||||||
return tres;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return tres;
|
||||||
|
}
|
||||||
|
|
||||||
|
JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_isUpdateQueryImp(JNIEnv *env, jobject jobj, jlong con,
|
||||||
|
jlong tres) {
|
||||||
|
TAOS *tscon = (TAOS *)con;
|
||||||
|
if (tscon == NULL) {
|
||||||
|
jniError("jobj:%p, connection is closed", jobj);
|
||||||
|
return JNI_CONNECTION_NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((void *)tres == NULL) {
|
||||||
|
jniError("jobj:%p, conn:%p, resultset is null", jobj, tscon);
|
||||||
|
return JNI_RESULT_SET_NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
SSqlObj *pSql = (TAOS_RES *)tres;
|
||||||
|
|
||||||
|
return (tscIsUpdateQuery(pSql)? 1:0);
|
||||||
}
|
}
|
||||||
|
|
||||||
JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_freeResultSetImp(JNIEnv *env, jobject jobj, jlong con,
|
JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_freeResultSetImp(JNIEnv *env, jobject jobj, jlong con,
|
||||||
|
|
|
||||||
|
|
@ -1,37 +0,0 @@
|
||||||
node_modules
|
|
||||||
npm-debug.log
|
|
||||||
coverage/
|
|
||||||
.aws-config.json
|
|
||||||
awsconfig
|
|
||||||
/emails/dist
|
|
||||||
/public_gen
|
|
||||||
/tmp
|
|
||||||
vendor/phantomjs/phantomjs
|
|
||||||
|
|
||||||
docs/AWS_S3_BUCKET
|
|
||||||
docs/GIT_BRANCH
|
|
||||||
docs/VERSION
|
|
||||||
docs/GITCOMMIT
|
|
||||||
docs/changed-files
|
|
||||||
docs/changed-files
|
|
||||||
|
|
||||||
# locally required config files
|
|
||||||
public/css/*.min.css
|
|
||||||
|
|
||||||
# Editor junk
|
|
||||||
*.sublime-workspace
|
|
||||||
*.swp
|
|
||||||
.idea/
|
|
||||||
*.iml
|
|
||||||
|
|
||||||
/data/*
|
|
||||||
/bin/*
|
|
||||||
|
|
||||||
conf/custom.ini
|
|
||||||
fig.yml
|
|
||||||
profile.cov
|
|
||||||
grafana
|
|
||||||
.notouch
|
|
||||||
|
|
||||||
# Test artifacts
|
|
||||||
/dist/test/
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
{
|
|
||||||
"esnext": true,
|
|
||||||
"disallowImplicitTypeConversion": ["string"],
|
|
||||||
"disallowKeywords": ["with"],
|
|
||||||
"disallowMultipleLineBreaks": true,
|
|
||||||
"disallowMixedSpacesAndTabs": true,
|
|
||||||
"disallowTrailingWhitespace": true,
|
|
||||||
"requireSpacesInFunctionExpression": {
|
|
||||||
"beforeOpeningCurlyBrace": true
|
|
||||||
},
|
|
||||||
"disallowSpacesInsideArrayBrackets": true,
|
|
||||||
"disallowSpacesInsideParentheses": true,
|
|
||||||
"validateIndentation": 2
|
|
||||||
}
|
|
||||||
|
|
@ -1,85 +0,0 @@
|
||||||
module.exports = function(grunt) {
|
|
||||||
|
|
||||||
require('load-grunt-tasks')(grunt);
|
|
||||||
|
|
||||||
grunt.loadNpmTasks('grunt-execute');
|
|
||||||
grunt.loadNpmTasks('grunt-contrib-clean');
|
|
||||||
|
|
||||||
grunt.initConfig({
|
|
||||||
|
|
||||||
clean: ["dist"],
|
|
||||||
|
|
||||||
copy: {
|
|
||||||
src_to_dist: {
|
|
||||||
cwd: 'src',
|
|
||||||
expand: true,
|
|
||||||
src: ['**/*', '!**/*.js', '!**/*.scss'],
|
|
||||||
dest: 'dist'
|
|
||||||
},
|
|
||||||
dashboard_to_dist: {
|
|
||||||
expand: true,
|
|
||||||
src: ['dashboard/*'],
|
|
||||||
dest: 'dist'
|
|
||||||
},
|
|
||||||
pluginDef: {
|
|
||||||
expand: true,
|
|
||||||
src: ['README.md'],
|
|
||||||
dest: 'dist'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
watch: {
|
|
||||||
rebuild_all: {
|
|
||||||
files: ['src/**/*'],
|
|
||||||
tasks: ['default'],
|
|
||||||
options: {spawn: false}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
babel: {
|
|
||||||
options: {
|
|
||||||
sourceMap: true,
|
|
||||||
presets: ['env'],
|
|
||||||
plugins: ['transform-object-rest-spread']
|
|
||||||
},
|
|
||||||
dist: {
|
|
||||||
files: [{
|
|
||||||
cwd: 'src',
|
|
||||||
expand: true,
|
|
||||||
src: ['**/*.js'],
|
|
||||||
dest: 'dist',
|
|
||||||
ext:'.js'
|
|
||||||
}]
|
|
||||||
},
|
|
||||||
distTestNoSystemJs: {
|
|
||||||
files: [{
|
|
||||||
cwd: 'src',
|
|
||||||
expand: true,
|
|
||||||
src: ['**/*.js'],
|
|
||||||
dest: 'dist/test',
|
|
||||||
ext:'.js'
|
|
||||||
}]
|
|
||||||
},
|
|
||||||
distTestsSpecsNoSystemJs: {
|
|
||||||
files: [{
|
|
||||||
expand: true,
|
|
||||||
cwd: 'spec',
|
|
||||||
src: ['**/*.js'],
|
|
||||||
dest: 'dist/test/spec',
|
|
||||||
ext:'.js'
|
|
||||||
}]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
mochaTest: {
|
|
||||||
test: {
|
|
||||||
options: {
|
|
||||||
reporter: 'spec'
|
|
||||||
},
|
|
||||||
src: ['dist/test/spec/test-main.js', 'dist/test/spec/*_spec.js']
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
grunt.registerTask('default', ['clean', 'copy:src_to_dist', 'copy:dashboard_to_dist', 'copy:pluginDef', 'babel', 'mochaTest']);
|
|
||||||
};
|
|
||||||
|
|
@ -1,661 +0,0 @@
|
||||||
GNU AFFERO GENERAL PUBLIC LICENSE
|
|
||||||
Version 3, 19 November 2007
|
|
||||||
|
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
|
||||||
of this license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
Preamble
|
|
||||||
|
|
||||||
The GNU Affero General Public License is a free, copyleft license for
|
|
||||||
software and other kinds of works, specifically designed to ensure
|
|
||||||
cooperation with the community in the case of network server software.
|
|
||||||
|
|
||||||
The licenses for most software and other practical works are designed
|
|
||||||
to take away your freedom to share and change the works. By contrast,
|
|
||||||
our General Public Licenses are intended to guarantee your freedom to
|
|
||||||
share and change all versions of a program--to make sure it remains free
|
|
||||||
software for all its users.
|
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
|
||||||
have the freedom to distribute copies of free software (and charge for
|
|
||||||
them if you wish), that you receive source code or can get it if you
|
|
||||||
want it, that you can change the software or use pieces of it in new
|
|
||||||
free programs, and that you know you can do these things.
|
|
||||||
|
|
||||||
Developers that use our General Public Licenses protect your rights
|
|
||||||
with two steps: (1) assert copyright on the software, and (2) offer
|
|
||||||
you this License which gives you legal permission to copy, distribute
|
|
||||||
and/or modify the software.
|
|
||||||
|
|
||||||
A secondary benefit of defending all users' freedom is that
|
|
||||||
improvements made in alternate versions of the program, if they
|
|
||||||
receive widespread use, become available for other developers to
|
|
||||||
incorporate. Many developers of free software are heartened and
|
|
||||||
encouraged by the resulting cooperation. However, in the case of
|
|
||||||
software used on network servers, this result may fail to come about.
|
|
||||||
The GNU General Public License permits making a modified version and
|
|
||||||
letting the public access it on a server without ever releasing its
|
|
||||||
source code to the public.
|
|
||||||
|
|
||||||
The GNU Affero General Public License is designed specifically to
|
|
||||||
ensure that, in such cases, the modified source code becomes available
|
|
||||||
to the community. It requires the operator of a network server to
|
|
||||||
provide the source code of the modified version running there to the
|
|
||||||
users of that server. Therefore, public use of a modified version, on
|
|
||||||
a publicly accessible server, gives the public access to the source
|
|
||||||
code of the modified version.
|
|
||||||
|
|
||||||
An older license, called the Affero General Public License and
|
|
||||||
published by Affero, was designed to accomplish similar goals. This is
|
|
||||||
a different license, not a version of the Affero GPL, but Affero has
|
|
||||||
released a new version of the Affero GPL which permits relicensing under
|
|
||||||
this license.
|
|
||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
|
||||||
modification follow.
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
0. Definitions.
|
|
||||||
|
|
||||||
"This License" refers to version 3 of the GNU Affero General Public License.
|
|
||||||
|
|
||||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
|
||||||
works, such as semiconductor masks.
|
|
||||||
|
|
||||||
"The Program" refers to any copyrightable work licensed under this
|
|
||||||
License. Each licensee is addressed as "you". "Licensees" and
|
|
||||||
"recipients" may be individuals or organizations.
|
|
||||||
|
|
||||||
To "modify" a work means to copy from or adapt all or part of the work
|
|
||||||
in a fashion requiring copyright permission, other than the making of an
|
|
||||||
exact copy. The resulting work is called a "modified version" of the
|
|
||||||
earlier work or a work "based on" the earlier work.
|
|
||||||
|
|
||||||
A "covered work" means either the unmodified Program or a work based
|
|
||||||
on the Program.
|
|
||||||
|
|
||||||
To "propagate" a work means to do anything with it that, without
|
|
||||||
permission, would make you directly or secondarily liable for
|
|
||||||
infringement under applicable copyright law, except executing it on a
|
|
||||||
computer or modifying a private copy. Propagation includes copying,
|
|
||||||
distribution (with or without modification), making available to the
|
|
||||||
public, and in some countries other activities as well.
|
|
||||||
|
|
||||||
To "convey" a work means any kind of propagation that enables other
|
|
||||||
parties to make or receive copies. Mere interaction with a user through
|
|
||||||
a computer network, with no transfer of a copy, is not conveying.
|
|
||||||
|
|
||||||
An interactive user interface displays "Appropriate Legal Notices"
|
|
||||||
to the extent that it includes a convenient and prominently visible
|
|
||||||
feature that (1) displays an appropriate copyright notice, and (2)
|
|
||||||
tells the user that there is no warranty for the work (except to the
|
|
||||||
extent that warranties are provided), that licensees may convey the
|
|
||||||
work under this License, and how to view a copy of this License. If
|
|
||||||
the interface presents a list of user commands or options, such as a
|
|
||||||
menu, a prominent item in the list meets this criterion.
|
|
||||||
|
|
||||||
1. Source Code.
|
|
||||||
|
|
||||||
The "source code" for a work means the preferred form of the work
|
|
||||||
for making modifications to it. "Object code" means any non-source
|
|
||||||
form of a work.
|
|
||||||
|
|
||||||
A "Standard Interface" means an interface that either is an official
|
|
||||||
standard defined by a recognized standards body, or, in the case of
|
|
||||||
interfaces specified for a particular programming language, one that
|
|
||||||
is widely used among developers working in that language.
|
|
||||||
|
|
||||||
The "System Libraries" of an executable work include anything, other
|
|
||||||
than the work as a whole, that (a) is included in the normal form of
|
|
||||||
packaging a Major Component, but which is not part of that Major
|
|
||||||
Component, and (b) serves only to enable use of the work with that
|
|
||||||
Major Component, or to implement a Standard Interface for which an
|
|
||||||
implementation is available to the public in source code form. A
|
|
||||||
"Major Component", in this context, means a major essential component
|
|
||||||
(kernel, window system, and so on) of the specific operating system
|
|
||||||
(if any) on which the executable work runs, or a compiler used to
|
|
||||||
produce the work, or an object code interpreter used to run it.
|
|
||||||
|
|
||||||
The "Corresponding Source" for a work in object code form means all
|
|
||||||
the source code needed to generate, install, and (for an executable
|
|
||||||
work) run the object code and to modify the work, including scripts to
|
|
||||||
control those activities. However, it does not include the work's
|
|
||||||
System Libraries, or general-purpose tools or generally available free
|
|
||||||
programs which are used unmodified in performing those activities but
|
|
||||||
which are not part of the work. For example, Corresponding Source
|
|
||||||
includes interface definition files associated with source files for
|
|
||||||
the work, and the source code for shared libraries and dynamically
|
|
||||||
linked subprograms that the work is specifically designed to require,
|
|
||||||
such as by intimate data communication or control flow between those
|
|
||||||
subprograms and other parts of the work.
|
|
||||||
|
|
||||||
The Corresponding Source need not include anything that users
|
|
||||||
can regenerate automatically from other parts of the Corresponding
|
|
||||||
Source.
|
|
||||||
|
|
||||||
The Corresponding Source for a work in source code form is that
|
|
||||||
same work.
|
|
||||||
|
|
||||||
2. Basic Permissions.
|
|
||||||
|
|
||||||
All rights granted under this License are granted for the term of
|
|
||||||
copyright on the Program, and are irrevocable provided the stated
|
|
||||||
conditions are met. This License explicitly affirms your unlimited
|
|
||||||
permission to run the unmodified Program. The output from running a
|
|
||||||
covered work is covered by this License only if the output, given its
|
|
||||||
content, constitutes a covered work. This License acknowledges your
|
|
||||||
rights of fair use or other equivalent, as provided by copyright law.
|
|
||||||
|
|
||||||
You may make, run and propagate covered works that you do not
|
|
||||||
convey, without conditions so long as your license otherwise remains
|
|
||||||
in force. You may convey covered works to others for the sole purpose
|
|
||||||
of having them make modifications exclusively for you, or provide you
|
|
||||||
with facilities for running those works, provided that you comply with
|
|
||||||
the terms of this License in conveying all material for which you do
|
|
||||||
not control copyright. Those thus making or running the covered works
|
|
||||||
for you must do so exclusively on your behalf, under your direction
|
|
||||||
and control, on terms that prohibit them from making any copies of
|
|
||||||
your copyrighted material outside their relationship with you.
|
|
||||||
|
|
||||||
Conveying under any other circumstances is permitted solely under
|
|
||||||
the conditions stated below. Sublicensing is not allowed; section 10
|
|
||||||
makes it unnecessary.
|
|
||||||
|
|
||||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
|
||||||
|
|
||||||
No covered work shall be deemed part of an effective technological
|
|
||||||
measure under any applicable law fulfilling obligations under article
|
|
||||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
|
||||||
similar laws prohibiting or restricting circumvention of such
|
|
||||||
measures.
|
|
||||||
|
|
||||||
When you convey a covered work, you waive any legal power to forbid
|
|
||||||
circumvention of technological measures to the extent such circumvention
|
|
||||||
is effected by exercising rights under this License with respect to
|
|
||||||
the covered work, and you disclaim any intention to limit operation or
|
|
||||||
modification of the work as a means of enforcing, against the work's
|
|
||||||
users, your or third parties' legal rights to forbid circumvention of
|
|
||||||
technological measures.
|
|
||||||
|
|
||||||
4. Conveying Verbatim Copies.
|
|
||||||
|
|
||||||
You may convey verbatim copies of the Program's source code as you
|
|
||||||
receive it, in any medium, provided that you conspicuously and
|
|
||||||
appropriately publish on each copy an appropriate copyright notice;
|
|
||||||
keep intact all notices stating that this License and any
|
|
||||||
non-permissive terms added in accord with section 7 apply to the code;
|
|
||||||
keep intact all notices of the absence of any warranty; and give all
|
|
||||||
recipients a copy of this License along with the Program.
|
|
||||||
|
|
||||||
You may charge any price or no price for each copy that you convey,
|
|
||||||
and you may offer support or warranty protection for a fee.
|
|
||||||
|
|
||||||
5. Conveying Modified Source Versions.
|
|
||||||
|
|
||||||
You may convey a work based on the Program, or the modifications to
|
|
||||||
produce it from the Program, in the form of source code under the
|
|
||||||
terms of section 4, provided that you also meet all of these conditions:
|
|
||||||
|
|
||||||
a) The work must carry prominent notices stating that you modified
|
|
||||||
it, and giving a relevant date.
|
|
||||||
|
|
||||||
b) The work must carry prominent notices stating that it is
|
|
||||||
released under this License and any conditions added under section
|
|
||||||
7. This requirement modifies the requirement in section 4 to
|
|
||||||
"keep intact all notices".
|
|
||||||
|
|
||||||
c) You must license the entire work, as a whole, under this
|
|
||||||
License to anyone who comes into possession of a copy. This
|
|
||||||
License will therefore apply, along with any applicable section 7
|
|
||||||
additional terms, to the whole of the work, and all its parts,
|
|
||||||
regardless of how they are packaged. This License gives no
|
|
||||||
permission to license the work in any other way, but it does not
|
|
||||||
invalidate such permission if you have separately received it.
|
|
||||||
|
|
||||||
d) If the work has interactive user interfaces, each must display
|
|
||||||
Appropriate Legal Notices; however, if the Program has interactive
|
|
||||||
interfaces that do not display Appropriate Legal Notices, your
|
|
||||||
work need not make them do so.
|
|
||||||
|
|
||||||
A compilation of a covered work with other separate and independent
|
|
||||||
works, which are not by their nature extensions of the covered work,
|
|
||||||
and which are not combined with it such as to form a larger program,
|
|
||||||
in or on a volume of a storage or distribution medium, is called an
|
|
||||||
"aggregate" if the compilation and its resulting copyright are not
|
|
||||||
used to limit the access or legal rights of the compilation's users
|
|
||||||
beyond what the individual works permit. Inclusion of a covered work
|
|
||||||
in an aggregate does not cause this License to apply to the other
|
|
||||||
parts of the aggregate.
|
|
||||||
|
|
||||||
6. Conveying Non-Source Forms.
|
|
||||||
|
|
||||||
You may convey a covered work in object code form under the terms
|
|
||||||
of sections 4 and 5, provided that you also convey the
|
|
||||||
machine-readable Corresponding Source under the terms of this License,
|
|
||||||
in one of these ways:
|
|
||||||
|
|
||||||
a) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by the
|
|
||||||
Corresponding Source fixed on a durable physical medium
|
|
||||||
customarily used for software interchange.
|
|
||||||
|
|
||||||
b) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by a
|
|
||||||
written offer, valid for at least three years and valid for as
|
|
||||||
long as you offer spare parts or customer support for that product
|
|
||||||
model, to give anyone who possesses the object code either (1) a
|
|
||||||
copy of the Corresponding Source for all the software in the
|
|
||||||
product that is covered by this License, on a durable physical
|
|
||||||
medium customarily used for software interchange, for a price no
|
|
||||||
more than your reasonable cost of physically performing this
|
|
||||||
conveying of source, or (2) access to copy the
|
|
||||||
Corresponding Source from a network server at no charge.
|
|
||||||
|
|
||||||
c) Convey individual copies of the object code with a copy of the
|
|
||||||
written offer to provide the Corresponding Source. This
|
|
||||||
alternative is allowed only occasionally and noncommercially, and
|
|
||||||
only if you received the object code with such an offer, in accord
|
|
||||||
with subsection 6b.
|
|
||||||
|
|
||||||
d) Convey the object code by offering access from a designated
|
|
||||||
place (gratis or for a charge), and offer equivalent access to the
|
|
||||||
Corresponding Source in the same way through the same place at no
|
|
||||||
further charge. You need not require recipients to copy the
|
|
||||||
Corresponding Source along with the object code. If the place to
|
|
||||||
copy the object code is a network server, the Corresponding Source
|
|
||||||
may be on a different server (operated by you or a third party)
|
|
||||||
that supports equivalent copying facilities, provided you maintain
|
|
||||||
clear directions next to the object code saying where to find the
|
|
||||||
Corresponding Source. Regardless of what server hosts the
|
|
||||||
Corresponding Source, you remain obligated to ensure that it is
|
|
||||||
available for as long as needed to satisfy these requirements.
|
|
||||||
|
|
||||||
e) Convey the object code using peer-to-peer transmission, provided
|
|
||||||
you inform other peers where the object code and Corresponding
|
|
||||||
Source of the work are being offered to the general public at no
|
|
||||||
charge under subsection 6d.
|
|
||||||
|
|
||||||
A separable portion of the object code, whose source code is excluded
|
|
||||||
from the Corresponding Source as a System Library, need not be
|
|
||||||
included in conveying the object code work.
|
|
||||||
|
|
||||||
A "User Product" is either (1) a "consumer product", which means any
|
|
||||||
tangible personal property which is normally used for personal, family,
|
|
||||||
or household purposes, or (2) anything designed or sold for incorporation
|
|
||||||
into a dwelling. In determining whether a product is a consumer product,
|
|
||||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
|
||||||
product received by a particular user, "normally used" refers to a
|
|
||||||
typical or common use of that class of product, regardless of the status
|
|
||||||
of the particular user or of the way in which the particular user
|
|
||||||
actually uses, or expects or is expected to use, the product. A product
|
|
||||||
is a consumer product regardless of whether the product has substantial
|
|
||||||
commercial, industrial or non-consumer uses, unless such uses represent
|
|
||||||
the only significant mode of use of the product.
|
|
||||||
|
|
||||||
"Installation Information" for a User Product means any methods,
|
|
||||||
procedures, authorization keys, or other information required to install
|
|
||||||
and execute modified versions of a covered work in that User Product from
|
|
||||||
a modified version of its Corresponding Source. The information must
|
|
||||||
suffice to ensure that the continued functioning of the modified object
|
|
||||||
code is in no case prevented or interfered with solely because
|
|
||||||
modification has been made.
|
|
||||||
|
|
||||||
If you convey an object code work under this section in, or with, or
|
|
||||||
specifically for use in, a User Product, and the conveying occurs as
|
|
||||||
part of a transaction in which the right of possession and use of the
|
|
||||||
User Product is transferred to the recipient in perpetuity or for a
|
|
||||||
fixed term (regardless of how the transaction is characterized), the
|
|
||||||
Corresponding Source conveyed under this section must be accompanied
|
|
||||||
by the Installation Information. But this requirement does not apply
|
|
||||||
if neither you nor any third party retains the ability to install
|
|
||||||
modified object code on the User Product (for example, the work has
|
|
||||||
been installed in ROM).
|
|
||||||
|
|
||||||
The requirement to provide Installation Information does not include a
|
|
||||||
requirement to continue to provide support service, warranty, or updates
|
|
||||||
for a work that has been modified or installed by the recipient, or for
|
|
||||||
the User Product in which it has been modified or installed. Access to a
|
|
||||||
network may be denied when the modification itself materially and
|
|
||||||
adversely affects the operation of the network or violates the rules and
|
|
||||||
protocols for communication across the network.
|
|
||||||
|
|
||||||
Corresponding Source conveyed, and Installation Information provided,
|
|
||||||
in accord with this section must be in a format that is publicly
|
|
||||||
documented (and with an implementation available to the public in
|
|
||||||
source code form), and must require no special password or key for
|
|
||||||
unpacking, reading or copying.
|
|
||||||
|
|
||||||
7. Additional Terms.
|
|
||||||
|
|
||||||
"Additional permissions" are terms that supplement the terms of this
|
|
||||||
License by making exceptions from one or more of its conditions.
|
|
||||||
Additional permissions that are applicable to the entire Program shall
|
|
||||||
be treated as though they were included in this License, to the extent
|
|
||||||
that they are valid under applicable law. If additional permissions
|
|
||||||
apply only to part of the Program, that part may be used separately
|
|
||||||
under those permissions, but the entire Program remains governed by
|
|
||||||
this License without regard to the additional permissions.
|
|
||||||
|
|
||||||
When you convey a copy of a covered work, you may at your option
|
|
||||||
remove any additional permissions from that copy, or from any part of
|
|
||||||
it. (Additional permissions may be written to require their own
|
|
||||||
removal in certain cases when you modify the work.) You may place
|
|
||||||
additional permissions on material, added by you to a covered work,
|
|
||||||
for which you have or can give appropriate copyright permission.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, for material you
|
|
||||||
add to a covered work, you may (if authorized by the copyright holders of
|
|
||||||
that material) supplement the terms of this License with terms:
|
|
||||||
|
|
||||||
a) Disclaiming warranty or limiting liability differently from the
|
|
||||||
terms of sections 15 and 16 of this License; or
|
|
||||||
|
|
||||||
b) Requiring preservation of specified reasonable legal notices or
|
|
||||||
author attributions in that material or in the Appropriate Legal
|
|
||||||
Notices displayed by works containing it; or
|
|
||||||
|
|
||||||
c) Prohibiting misrepresentation of the origin of that material, or
|
|
||||||
requiring that modified versions of such material be marked in
|
|
||||||
reasonable ways as different from the original version; or
|
|
||||||
|
|
||||||
d) Limiting the use for publicity purposes of names of licensors or
|
|
||||||
authors of the material; or
|
|
||||||
|
|
||||||
e) Declining to grant rights under trademark law for use of some
|
|
||||||
trade names, trademarks, or service marks; or
|
|
||||||
|
|
||||||
f) Requiring indemnification of licensors and authors of that
|
|
||||||
material by anyone who conveys the material (or modified versions of
|
|
||||||
it) with contractual assumptions of liability to the recipient, for
|
|
||||||
any liability that these contractual assumptions directly impose on
|
|
||||||
those licensors and authors.
|
|
||||||
|
|
||||||
All other non-permissive additional terms are considered "further
|
|
||||||
restrictions" within the meaning of section 10. If the Program as you
|
|
||||||
received it, or any part of it, contains a notice stating that it is
|
|
||||||
governed by this License along with a term that is a further
|
|
||||||
restriction, you may remove that term. If a license document contains
|
|
||||||
a further restriction but permits relicensing or conveying under this
|
|
||||||
License, you may add to a covered work material governed by the terms
|
|
||||||
of that license document, provided that the further restriction does
|
|
||||||
not survive such relicensing or conveying.
|
|
||||||
|
|
||||||
If you add terms to a covered work in accord with this section, you
|
|
||||||
must place, in the relevant source files, a statement of the
|
|
||||||
additional terms that apply to those files, or a notice indicating
|
|
||||||
where to find the applicable terms.
|
|
||||||
|
|
||||||
Additional terms, permissive or non-permissive, may be stated in the
|
|
||||||
form of a separately written license, or stated as exceptions;
|
|
||||||
the above requirements apply either way.
|
|
||||||
|
|
||||||
8. Termination.
|
|
||||||
|
|
||||||
You may not propagate or modify a covered work except as expressly
|
|
||||||
provided under this License. Any attempt otherwise to propagate or
|
|
||||||
modify it is void, and will automatically terminate your rights under
|
|
||||||
this License (including any patent licenses granted under the third
|
|
||||||
paragraph of section 11).
|
|
||||||
|
|
||||||
However, if you cease all violation of this License, then your
|
|
||||||
license from a particular copyright holder is reinstated (a)
|
|
||||||
provisionally, unless and until the copyright holder explicitly and
|
|
||||||
finally terminates your license, and (b) permanently, if the copyright
|
|
||||||
holder fails to notify you of the violation by some reasonable means
|
|
||||||
prior to 60 days after the cessation.
|
|
||||||
|
|
||||||
Moreover, your license from a particular copyright holder is
|
|
||||||
reinstated permanently if the copyright holder notifies you of the
|
|
||||||
violation by some reasonable means, this is the first time you have
|
|
||||||
received notice of violation of this License (for any work) from that
|
|
||||||
copyright holder, and you cure the violation prior to 30 days after
|
|
||||||
your receipt of the notice.
|
|
||||||
|
|
||||||
Termination of your rights under this section does not terminate the
|
|
||||||
licenses of parties who have received copies or rights from you under
|
|
||||||
this License. If your rights have been terminated and not permanently
|
|
||||||
reinstated, you do not qualify to receive new licenses for the same
|
|
||||||
material under section 10.
|
|
||||||
|
|
||||||
9. Acceptance Not Required for Having Copies.
|
|
||||||
|
|
||||||
You are not required to accept this License in order to receive or
|
|
||||||
run a copy of the Program. Ancillary propagation of a covered work
|
|
||||||
occurring solely as a consequence of using peer-to-peer transmission
|
|
||||||
to receive a copy likewise does not require acceptance. However,
|
|
||||||
nothing other than this License grants you permission to propagate or
|
|
||||||
modify any covered work. These actions infringe copyright if you do
|
|
||||||
not accept this License. Therefore, by modifying or propagating a
|
|
||||||
covered work, you indicate your acceptance of this License to do so.
|
|
||||||
|
|
||||||
10. Automatic Licensing of Downstream Recipients.
|
|
||||||
|
|
||||||
Each time you convey a covered work, the recipient automatically
|
|
||||||
receives a license from the original licensors, to run, modify and
|
|
||||||
propagate that work, subject to this License. You are not responsible
|
|
||||||
for enforcing compliance by third parties with this License.
|
|
||||||
|
|
||||||
An "entity transaction" is a transaction transferring control of an
|
|
||||||
organization, or substantially all assets of one, or subdividing an
|
|
||||||
organization, or merging organizations. If propagation of a covered
|
|
||||||
work results from an entity transaction, each party to that
|
|
||||||
transaction who receives a copy of the work also receives whatever
|
|
||||||
licenses to the work the party's predecessor in interest had or could
|
|
||||||
give under the previous paragraph, plus a right to possession of the
|
|
||||||
Corresponding Source of the work from the predecessor in interest, if
|
|
||||||
the predecessor has it or can get it with reasonable efforts.
|
|
||||||
|
|
||||||
You may not impose any further restrictions on the exercise of the
|
|
||||||
rights granted or affirmed under this License. For example, you may
|
|
||||||
not impose a license fee, royalty, or other charge for exercise of
|
|
||||||
rights granted under this License, and you may not initiate litigation
|
|
||||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
|
||||||
any patent claim is infringed by making, using, selling, offering for
|
|
||||||
sale, or importing the Program or any portion of it.
|
|
||||||
|
|
||||||
11. Patents.
|
|
||||||
|
|
||||||
A "contributor" is a copyright holder who authorizes use under this
|
|
||||||
License of the Program or a work on which the Program is based. The
|
|
||||||
work thus licensed is called the contributor's "contributor version".
|
|
||||||
|
|
||||||
A contributor's "essential patent claims" are all patent claims
|
|
||||||
owned or controlled by the contributor, whether already acquired or
|
|
||||||
hereafter acquired, that would be infringed by some manner, permitted
|
|
||||||
by this License, of making, using, or selling its contributor version,
|
|
||||||
but do not include claims that would be infringed only as a
|
|
||||||
consequence of further modification of the contributor version. For
|
|
||||||
purposes of this definition, "control" includes the right to grant
|
|
||||||
patent sublicenses in a manner consistent with the requirements of
|
|
||||||
this License.
|
|
||||||
|
|
||||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
|
||||||
patent license under the contributor's essential patent claims, to
|
|
||||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
|
||||||
propagate the contents of its contributor version.
|
|
||||||
|
|
||||||
In the following three paragraphs, a "patent license" is any express
|
|
||||||
agreement or commitment, however denominated, not to enforce a patent
|
|
||||||
(such as an express permission to practice a patent or covenant not to
|
|
||||||
sue for patent infringement). To "grant" such a patent license to a
|
|
||||||
party means to make such an agreement or commitment not to enforce a
|
|
||||||
patent against the party.
|
|
||||||
|
|
||||||
If you convey a covered work, knowingly relying on a patent license,
|
|
||||||
and the Corresponding Source of the work is not available for anyone
|
|
||||||
to copy, free of charge and under the terms of this License, through a
|
|
||||||
publicly available network server or other readily accessible means,
|
|
||||||
then you must either (1) cause the Corresponding Source to be so
|
|
||||||
available, or (2) arrange to deprive yourself of the benefit of the
|
|
||||||
patent license for this particular work, or (3) arrange, in a manner
|
|
||||||
consistent with the requirements of this License, to extend the patent
|
|
||||||
license to downstream recipients. "Knowingly relying" means you have
|
|
||||||
actual knowledge that, but for the patent license, your conveying the
|
|
||||||
covered work in a country, or your recipient's use of the covered work
|
|
||||||
in a country, would infringe one or more identifiable patents in that
|
|
||||||
country that you have reason to believe are valid.
|
|
||||||
|
|
||||||
If, pursuant to or in connection with a single transaction or
|
|
||||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
|
||||||
covered work, and grant a patent license to some of the parties
|
|
||||||
receiving the covered work authorizing them to use, propagate, modify
|
|
||||||
or convey a specific copy of the covered work, then the patent license
|
|
||||||
you grant is automatically extended to all recipients of the covered
|
|
||||||
work and works based on it.
|
|
||||||
|
|
||||||
A patent license is "discriminatory" if it does not include within
|
|
||||||
the scope of its coverage, prohibits the exercise of, or is
|
|
||||||
conditioned on the non-exercise of one or more of the rights that are
|
|
||||||
specifically granted under this License. You may not convey a covered
|
|
||||||
work if you are a party to an arrangement with a third party that is
|
|
||||||
in the business of distributing software, under which you make payment
|
|
||||||
to the third party based on the extent of your activity of conveying
|
|
||||||
the work, and under which the third party grants, to any of the
|
|
||||||
parties who would receive the covered work from you, a discriminatory
|
|
||||||
patent license (a) in connection with copies of the covered work
|
|
||||||
conveyed by you (or copies made from those copies), or (b) primarily
|
|
||||||
for and in connection with specific products or compilations that
|
|
||||||
contain the covered work, unless you entered into that arrangement,
|
|
||||||
or that patent license was granted, prior to 28 March 2007.
|
|
||||||
|
|
||||||
Nothing in this License shall be construed as excluding or limiting
|
|
||||||
any implied license or other defenses to infringement that may
|
|
||||||
otherwise be available to you under applicable patent law.
|
|
||||||
|
|
||||||
12. No Surrender of Others' Freedom.
|
|
||||||
|
|
||||||
If conditions are imposed on you (whether by court order, agreement or
|
|
||||||
otherwise) that contradict the conditions of this License, they do not
|
|
||||||
excuse you from the conditions of this License. If you cannot convey a
|
|
||||||
covered work so as to satisfy simultaneously your obligations under this
|
|
||||||
License and any other pertinent obligations, then as a consequence you may
|
|
||||||
not convey it at all. For example, if you agree to terms that obligate you
|
|
||||||
to collect a royalty for further conveying from those to whom you convey
|
|
||||||
the Program, the only way you could satisfy both those terms and this
|
|
||||||
License would be to refrain entirely from conveying the Program.
|
|
||||||
|
|
||||||
13. Remote Network Interaction; Use with the GNU General Public License.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, if you modify the
|
|
||||||
Program, your modified version must prominently offer all users
|
|
||||||
interacting with it remotely through a computer network (if your version
|
|
||||||
supports such interaction) an opportunity to receive the Corresponding
|
|
||||||
Source of your version by providing access to the Corresponding Source
|
|
||||||
from a network server at no charge, through some standard or customary
|
|
||||||
means of facilitating copying of software. This Corresponding Source
|
|
||||||
shall include the Corresponding Source for any work covered by version 3
|
|
||||||
of the GNU General Public License that is incorporated pursuant to the
|
|
||||||
following paragraph.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, you have
|
|
||||||
permission to link or combine any covered work with a work licensed
|
|
||||||
under version 3 of the GNU General Public License into a single
|
|
||||||
combined work, and to convey the resulting work. The terms of this
|
|
||||||
License will continue to apply to the part which is the covered work,
|
|
||||||
but the work with which it is combined will remain governed by version
|
|
||||||
3 of the GNU General Public License.
|
|
||||||
|
|
||||||
14. Revised Versions of this License.
|
|
||||||
|
|
||||||
The Free Software Foundation may publish revised and/or new versions of
|
|
||||||
the GNU Affero General Public License from time to time. Such new versions
|
|
||||||
will be similar in spirit to the present version, but may differ in detail to
|
|
||||||
address new problems or concerns.
|
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the
|
|
||||||
Program specifies that a certain numbered version of the GNU Affero General
|
|
||||||
Public License "or any later version" applies to it, you have the
|
|
||||||
option of following the terms and conditions either of that numbered
|
|
||||||
version or of any later version published by the Free Software
|
|
||||||
Foundation. If the Program does not specify a version number of the
|
|
||||||
GNU Affero General Public License, you may choose any version ever published
|
|
||||||
by the Free Software Foundation.
|
|
||||||
|
|
||||||
If the Program specifies that a proxy can decide which future
|
|
||||||
versions of the GNU Affero General Public License can be used, that proxy's
|
|
||||||
public statement of acceptance of a version permanently authorizes you
|
|
||||||
to choose that version for the Program.
|
|
||||||
|
|
||||||
Later license versions may give you additional or different
|
|
||||||
permissions. However, no additional obligations are imposed on any
|
|
||||||
author or copyright holder as a result of your choosing to follow a
|
|
||||||
later version.
|
|
||||||
|
|
||||||
15. Disclaimer of Warranty.
|
|
||||||
|
|
||||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
|
||||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
|
||||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
|
||||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
||||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
|
||||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
|
||||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
|
||||||
|
|
||||||
16. Limitation of Liability.
|
|
||||||
|
|
||||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
|
||||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
|
||||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
|
||||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
|
||||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
|
||||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
|
||||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
|
||||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
|
||||||
SUCH DAMAGES.
|
|
||||||
|
|
||||||
17. Interpretation of Sections 15 and 16.
|
|
||||||
|
|
||||||
If the disclaimer of warranty and limitation of liability provided
|
|
||||||
above cannot be given local legal effect according to their terms,
|
|
||||||
reviewing courts shall apply local law that most closely approximates
|
|
||||||
an absolute waiver of all civil liability in connection with the
|
|
||||||
Program, unless a warranty or assumption of liability accompanies a
|
|
||||||
copy of the Program in return for a fee.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
How to Apply These Terms to Your New Programs
|
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
|
||||||
possible use to the public, the best way to achieve this is to make it
|
|
||||||
free software which everyone can redistribute and change under these terms.
|
|
||||||
|
|
||||||
To do so, attach the following notices to the program. It is safest
|
|
||||||
to attach them to the start of each source file to most effectively
|
|
||||||
state the exclusion of warranty; and each file should have at least
|
|
||||||
the "copyright" line and a pointer to where the full notice is found.
|
|
||||||
|
|
||||||
<one line to give the program's name and a brief idea of what it does.>
|
|
||||||
Copyright (C) <year> <name of author>
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as published
|
|
||||||
by the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper mail.
|
|
||||||
|
|
||||||
If your software can interact with users remotely through a computer
|
|
||||||
network, you should also make sure that it provides a way for users to
|
|
||||||
get its source. For example, if your program is a web application, its
|
|
||||||
interface could display a "Source" link that leads users to an archive
|
|
||||||
of the code. There are many ways you could offer source, and different
|
|
||||||
solutions will be better for different programs; see section 13 for the
|
|
||||||
specific requirements.
|
|
||||||
|
|
||||||
You should also get your employer (if you work as a programmer) or school,
|
|
||||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
|
||||||
For more information on this, and how to apply and follow the GNU AGPL, see
|
|
||||||
<https://www.gnu.org/licenses/>.
|
|
||||||
|
|
@ -1,96 +0,0 @@
|
||||||
TDengine Datasource - build by Taosdata Inc. www.taosdata.com
|
|
||||||
|
|
||||||
TDengine backend server implement 2 urls:
|
|
||||||
|
|
||||||
* `/heartbeat` return 200 ok. Used for "Test connection" on the datasource config page.
|
|
||||||
* `/query` return data based on input sqls.
|
|
||||||
|
|
||||||
## Installation
|
|
||||||
|
|
||||||
To install this plugin:
|
|
||||||
Copy the data source you want to /var/lib/grafana/plugins/. Then restart grafana-server. The new data source should now be available in the data source type dropdown in the Add Data Source View.
|
|
||||||
|
|
||||||
```
|
|
||||||
cp -r <tdengine-extrach-dir>/connector/grafana/tdengine /var/lib/grafana/plugins/
|
|
||||||
sudo service grafana-server restart
|
|
||||||
```
|
|
||||||
|
|
||||||
### Query API
|
|
||||||
|
|
||||||
Example request
|
|
||||||
``` javascript
|
|
||||||
[{
|
|
||||||
"refId": "A",
|
|
||||||
"alias": "taosd-memory",
|
|
||||||
"sql": "select avg(mem_taosd) from sys.dn where ts > now-5m and ts < now interval(500a)"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"refId": "B",
|
|
||||||
"alias": "system-memory",
|
|
||||||
"sql": "select avg(mem_system) from sys.dn where ts > now-5m and ts < now interval(500a)"
|
|
||||||
}]
|
|
||||||
```
|
|
||||||
|
|
||||||
Example response
|
|
||||||
``` javascript
|
|
||||||
[{
|
|
||||||
"datapoints": [
|
|
||||||
[206.488281, 1538137825000],
|
|
||||||
[206.488281, 1538137855000],
|
|
||||||
[206.488281, 1538137885500],
|
|
||||||
[210.609375, 1538137915500],
|
|
||||||
[210.867188, 1538137945500]
|
|
||||||
],
|
|
||||||
"refId": "A",
|
|
||||||
"target": "taosd-memory"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"datapoints": [
|
|
||||||
[2910.218750, 1538137825000],
|
|
||||||
[2912.265625, 1538137855000],
|
|
||||||
[2912.437500, 1538137885500],
|
|
||||||
[2916.644531, 1538137915500],
|
|
||||||
[2917.066406, 1538137945500]
|
|
||||||
],
|
|
||||||
"refId": "B",
|
|
||||||
"target": "system-memory"
|
|
||||||
}]
|
|
||||||
```
|
|
||||||
|
|
||||||
### Heartbeat API
|
|
||||||
|
|
||||||
Example request
|
|
||||||
``` javascript
|
|
||||||
Get request /heartbeat
|
|
||||||
```
|
|
||||||
|
|
||||||
Example response
|
|
||||||
``` javascript
|
|
||||||
{
|
|
||||||
"message": "Grafana server receive a quest from you!"
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### Dev setup
|
|
||||||
|
|
||||||
This plugin requires node 6.10.0
|
|
||||||
|
|
||||||
``` javascript
|
|
||||||
|
|
||||||
npm install -g yarn
|
|
||||||
yarn install
|
|
||||||
npm run build
|
|
||||||
|
|
||||||
```
|
|
||||||
|
|
||||||
### Import Dashboard
|
|
||||||
|
|
||||||
after login `http://localhost:3000 `, then you can import the tdengine demo dashboard to monitor the system metrics.
|
|
||||||
|
|
||||||
you can import the `dashboard/tdengine-grafana.json`:
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
after finished import:
|
|
||||||
|
|
||||||
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 98 KiB |
|
|
@ -1,588 +0,0 @@
|
||||||
{
|
|
||||||
"annotations": {
|
|
||||||
"list": [
|
|
||||||
{
|
|
||||||
"builtIn": 1,
|
|
||||||
"datasource": "-- Grafana --",
|
|
||||||
"enable": true,
|
|
||||||
"hide": true,
|
|
||||||
"iconColor": "rgba(0, 211, 255, 1)",
|
|
||||||
"name": "Annotations & Alerts",
|
|
||||||
"type": "dashboard"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"editable": true,
|
|
||||||
"gnetId": null,
|
|
||||||
"graphTooltip": 0,
|
|
||||||
"id": 3,
|
|
||||||
"links": [],
|
|
||||||
"panels": [
|
|
||||||
{
|
|
||||||
"cacheTimeout": null,
|
|
||||||
"colorBackground": false,
|
|
||||||
"colorValue": true,
|
|
||||||
"colors": [
|
|
||||||
"#299c46",
|
|
||||||
"rgba(237, 129, 40, 0.89)",
|
|
||||||
"#d44a3a"
|
|
||||||
],
|
|
||||||
"datasource": "TDengine",
|
|
||||||
"description": "total select request per minute last hour",
|
|
||||||
"format": "none",
|
|
||||||
"gauge": {
|
|
||||||
"maxValue": 100,
|
|
||||||
"minValue": 0,
|
|
||||||
"show": false,
|
|
||||||
"thresholdLabels": false,
|
|
||||||
"thresholdMarkers": true
|
|
||||||
},
|
|
||||||
"gridPos": {
|
|
||||||
"h": 6,
|
|
||||||
"w": 12,
|
|
||||||
"x": 0,
|
|
||||||
"y": 0
|
|
||||||
},
|
|
||||||
"id": 8,
|
|
||||||
"interval": null,
|
|
||||||
"links": [],
|
|
||||||
"mappingType": 1,
|
|
||||||
"mappingTypes": [
|
|
||||||
{
|
|
||||||
"name": "value to text",
|
|
||||||
"value": 1
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "range to text",
|
|
||||||
"value": 2
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"maxDataPoints": 100,
|
|
||||||
"nullPointMode": "connected",
|
|
||||||
"nullText": null,
|
|
||||||
"options": {},
|
|
||||||
"postfix": "次数/min",
|
|
||||||
"postfixFontSize": "20%",
|
|
||||||
"prefix": "",
|
|
||||||
"prefixFontSize": "50%",
|
|
||||||
"rangeMaps": [
|
|
||||||
{
|
|
||||||
"from": "null",
|
|
||||||
"text": "N/A",
|
|
||||||
"to": "null"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"sparkline": {
|
|
||||||
"fillColor": "rgba(31, 118, 189, 0.18)",
|
|
||||||
"full": true,
|
|
||||||
"lineColor": "rgb(31, 120, 193)",
|
|
||||||
"show": true,
|
|
||||||
"ymax": null,
|
|
||||||
"ymin": null
|
|
||||||
},
|
|
||||||
"tableColumn": "",
|
|
||||||
"targets": [
|
|
||||||
{
|
|
||||||
"alias": "req_select",
|
|
||||||
"refId": "A",
|
|
||||||
"sql": "select sum(req_select) from log.dn where ts >= now-1h and ts < now interval(1m)",
|
|
||||||
"target": "select metric",
|
|
||||||
"type": "timeserie"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"thresholds": "120,240",
|
|
||||||
"timeFrom": null,
|
|
||||||
"timeShift": null,
|
|
||||||
"title": "req select",
|
|
||||||
"type": "singlestat",
|
|
||||||
"valueFontSize": "150%",
|
|
||||||
"valueMaps": [
|
|
||||||
{
|
|
||||||
"op": "=",
|
|
||||||
"text": "N/A",
|
|
||||||
"value": "null"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"valueName": "total"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"cacheTimeout": null,
|
|
||||||
"colorBackground": false,
|
|
||||||
"colorValue": true,
|
|
||||||
"colors": [
|
|
||||||
"#299c46",
|
|
||||||
"rgba(237, 129, 40, 0.89)",
|
|
||||||
"#d44a3a"
|
|
||||||
],
|
|
||||||
"datasource": "TDengine",
|
|
||||||
"description": "total insert request per minute for last hour",
|
|
||||||
"format": "none",
|
|
||||||
"gauge": {
|
|
||||||
"maxValue": 100,
|
|
||||||
"minValue": 0,
|
|
||||||
"show": false,
|
|
||||||
"thresholdLabels": false,
|
|
||||||
"thresholdMarkers": true
|
|
||||||
},
|
|
||||||
"gridPos": {
|
|
||||||
"h": 6,
|
|
||||||
"w": 12,
|
|
||||||
"x": 12,
|
|
||||||
"y": 0
|
|
||||||
},
|
|
||||||
"id": 6,
|
|
||||||
"interval": null,
|
|
||||||
"links": [],
|
|
||||||
"mappingType": 1,
|
|
||||||
"mappingTypes": [
|
|
||||||
{
|
|
||||||
"name": "value to text",
|
|
||||||
"value": 1
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "range to text",
|
|
||||||
"value": 2
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"maxDataPoints": 100,
|
|
||||||
"nullPointMode": "connected",
|
|
||||||
"nullText": null,
|
|
||||||
"options": {},
|
|
||||||
"postfix": "次数/min",
|
|
||||||
"postfixFontSize": "20%",
|
|
||||||
"prefix": "",
|
|
||||||
"prefixFontSize": "50%",
|
|
||||||
"rangeMaps": [
|
|
||||||
{
|
|
||||||
"from": "null",
|
|
||||||
"text": "N/A",
|
|
||||||
"to": "null"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"sparkline": {
|
|
||||||
"fillColor": "rgba(31, 118, 189, 0.18)",
|
|
||||||
"full": false,
|
|
||||||
"lineColor": "rgb(31, 120, 193)",
|
|
||||||
"show": true,
|
|
||||||
"ymax": null,
|
|
||||||
"ymin": null
|
|
||||||
},
|
|
||||||
"tableColumn": "",
|
|
||||||
"targets": [
|
|
||||||
{
|
|
||||||
"alias": "req_insert",
|
|
||||||
"refId": "A",
|
|
||||||
"sql": "select sum(req_insert) from log.dn where ts >= now-1h and ts < now interval(1m)",
|
|
||||||
"target": "select metric",
|
|
||||||
"type": "timeserie"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"thresholds": "110,240",
|
|
||||||
"timeFrom": null,
|
|
||||||
"timeShift": null,
|
|
||||||
"title": "req insert",
|
|
||||||
"type": "singlestat",
|
|
||||||
"valueFontSize": "150%",
|
|
||||||
"valueMaps": [
|
|
||||||
{
|
|
||||||
"op": "=",
|
|
||||||
"text": "N/A",
|
|
||||||
"value": "null"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"valueName": "total"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"datasource": "TDengine",
|
|
||||||
"description": "taosd max memery last 10 minutes",
|
|
||||||
"gridPos": {
|
|
||||||
"h": 6,
|
|
||||||
"w": 8,
|
|
||||||
"x": 0,
|
|
||||||
"y": 6
|
|
||||||
},
|
|
||||||
"id": 12,
|
|
||||||
"options": {
|
|
||||||
"fieldOptions": {
|
|
||||||
"calcs": [
|
|
||||||
"mean"
|
|
||||||
],
|
|
||||||
"defaults": {
|
|
||||||
"mappings": [],
|
|
||||||
"max": 4096,
|
|
||||||
"min": 0,
|
|
||||||
"thresholds": [
|
|
||||||
{
|
|
||||||
"color": "green",
|
|
||||||
"value": null
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"color": "red",
|
|
||||||
"value": 80
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"color": "#EAB839",
|
|
||||||
"value": 2048
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"unit": "decmbytes"
|
|
||||||
},
|
|
||||||
"override": {},
|
|
||||||
"values": false
|
|
||||||
},
|
|
||||||
"orientation": "auto",
|
|
||||||
"showThresholdLabels": true,
|
|
||||||
"showThresholdMarkers": true
|
|
||||||
},
|
|
||||||
"pluginVersion": "6.4.3",
|
|
||||||
"targets": [
|
|
||||||
{
|
|
||||||
"alias": "mem_taosd",
|
|
||||||
"refId": "A",
|
|
||||||
"sql": "select max(mem_taosd) from log.dn where ts >= now -10m and ts < now",
|
|
||||||
"target": "select metric",
|
|
||||||
"type": "timeserie"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"timeFrom": null,
|
|
||||||
"timeShift": null,
|
|
||||||
"title": "taosd memery",
|
|
||||||
"type": "gauge"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"datasource": "TDengine",
|
|
||||||
"description": "max System Memory last 1 hour",
|
|
||||||
"gridPos": {
|
|
||||||
"h": 6,
|
|
||||||
"w": 8,
|
|
||||||
"x": 8,
|
|
||||||
"y": 6
|
|
||||||
},
|
|
||||||
"id": 10,
|
|
||||||
"options": {
|
|
||||||
"fieldOptions": {
|
|
||||||
"calcs": [
|
|
||||||
"last"
|
|
||||||
],
|
|
||||||
"defaults": {
|
|
||||||
"mappings": [],
|
|
||||||
"max": 4,
|
|
||||||
"min": 0,
|
|
||||||
"thresholds": [
|
|
||||||
{
|
|
||||||
"color": "green",
|
|
||||||
"value": null
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"color": "semi-dark-orange",
|
|
||||||
"value": 60
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"color": "dark-red",
|
|
||||||
"value": 80
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"title": "",
|
|
||||||
"unit": "decmbytes"
|
|
||||||
},
|
|
||||||
"override": {},
|
|
||||||
"values": false
|
|
||||||
},
|
|
||||||
"orientation": "auto",
|
|
||||||
"showThresholdLabels": true,
|
|
||||||
"showThresholdMarkers": true
|
|
||||||
},
|
|
||||||
"pluginVersion": "6.4.3",
|
|
||||||
"targets": [
|
|
||||||
{
|
|
||||||
"alias": "mem_system",
|
|
||||||
"refId": "A",
|
|
||||||
"sql": "select max(mem_system) from log.dn where ts >= now -10h and ts < now",
|
|
||||||
"target": "select metric",
|
|
||||||
"type": "timeserie"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"timeFrom": null,
|
|
||||||
"timeShift": null,
|
|
||||||
"title": "system memory",
|
|
||||||
"type": "gauge"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"datasource": "TDengine",
|
|
||||||
"description": "avg band speed last one minute",
|
|
||||||
"gridPos": {
|
|
||||||
"h": 6,
|
|
||||||
"w": 8,
|
|
||||||
"x": 16,
|
|
||||||
"y": 6
|
|
||||||
},
|
|
||||||
"id": 14,
|
|
||||||
"options": {
|
|
||||||
"fieldOptions": {
|
|
||||||
"calcs": [
|
|
||||||
"last"
|
|
||||||
],
|
|
||||||
"defaults": {
|
|
||||||
"mappings": [],
|
|
||||||
"max": 8192,
|
|
||||||
"min": 0,
|
|
||||||
"thresholds": [
|
|
||||||
{
|
|
||||||
"color": "green",
|
|
||||||
"value": null
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"color": "#EAB839",
|
|
||||||
"value": 4916
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"color": "red",
|
|
||||||
"value": 6554
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"unit": "Kbits"
|
|
||||||
},
|
|
||||||
"override": {},
|
|
||||||
"values": false
|
|
||||||
},
|
|
||||||
"orientation": "auto",
|
|
||||||
"showThresholdLabels": true,
|
|
||||||
"showThresholdMarkers": true
|
|
||||||
},
|
|
||||||
"pluginVersion": "6.4.3",
|
|
||||||
"targets": [
|
|
||||||
{
|
|
||||||
"alias": "band_speed",
|
|
||||||
"refId": "A",
|
|
||||||
"sql": "select avg(band_speed) from log.dn where ts >= now-1h and ts < now interval(1m)",
|
|
||||||
"target": "select metric",
|
|
||||||
"type": "timeserie"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"timeFrom": null,
|
|
||||||
"timeShift": null,
|
|
||||||
"title": "band speed",
|
|
||||||
"type": "gauge"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"aliasColors": {},
|
|
||||||
"bars": false,
|
|
||||||
"cacheTimeout": null,
|
|
||||||
"dashLength": 10,
|
|
||||||
"dashes": false,
|
|
||||||
"datasource": "TDengine",
|
|
||||||
"description": "monitor system cpu",
|
|
||||||
"fill": 1,
|
|
||||||
"fillGradient": 0,
|
|
||||||
"gridPos": {
|
|
||||||
"h": 11,
|
|
||||||
"w": 12,
|
|
||||||
"x": 0,
|
|
||||||
"y": 12
|
|
||||||
},
|
|
||||||
"hideTimeOverride": true,
|
|
||||||
"id": 2,
|
|
||||||
"legend": {
|
|
||||||
"avg": false,
|
|
||||||
"current": false,
|
|
||||||
"max": false,
|
|
||||||
"min": false,
|
|
||||||
"show": true,
|
|
||||||
"total": false,
|
|
||||||
"values": false
|
|
||||||
},
|
|
||||||
"lines": true,
|
|
||||||
"linewidth": 1,
|
|
||||||
"links": [],
|
|
||||||
"nullPointMode": "null",
|
|
||||||
"options": {
|
|
||||||
"dataLinks": []
|
|
||||||
},
|
|
||||||
"percentage": false,
|
|
||||||
"pluginVersion": "6.4.3",
|
|
||||||
"pointradius": 2,
|
|
||||||
"points": false,
|
|
||||||
"renderer": "flot",
|
|
||||||
"seriesOverrides": [],
|
|
||||||
"spaceLength": 10,
|
|
||||||
"stack": false,
|
|
||||||
"steppedLine": false,
|
|
||||||
"targets": [
|
|
||||||
{
|
|
||||||
"alias": "cpu_system11",
|
|
||||||
"hide": false,
|
|
||||||
"refId": "A",
|
|
||||||
"sql": "select avg(cpu_system) from log.dn where ts >= now-1h and ts < now interval(1s)",
|
|
||||||
"target": "select metric",
|
|
||||||
"type": "timeserie"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"alias": "cpu_taosd",
|
|
||||||
"hide": false,
|
|
||||||
"refId": "B",
|
|
||||||
"sql": "select avg(cpu_taosd) from log.dn where ts >= now-1h and ts < now interval(1s)",
|
|
||||||
"target": "select metric",
|
|
||||||
"type": "timeserie"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"thresholds": [],
|
|
||||||
"timeFrom": "1h",
|
|
||||||
"timeRegions": [],
|
|
||||||
"timeShift": "30s",
|
|
||||||
"title": "cpu_system",
|
|
||||||
"tooltip": {
|
|
||||||
"shared": true,
|
|
||||||
"sort": 0,
|
|
||||||
"value_type": "individual"
|
|
||||||
},
|
|
||||||
"type": "graph",
|
|
||||||
"xaxis": {
|
|
||||||
"buckets": null,
|
|
||||||
"mode": "time",
|
|
||||||
"name": null,
|
|
||||||
"show": true,
|
|
||||||
"values": []
|
|
||||||
},
|
|
||||||
"yaxes": [
|
|
||||||
{
|
|
||||||
"decimals": null,
|
|
||||||
"format": "percent",
|
|
||||||
"label": "使用占比",
|
|
||||||
"logBase": 1,
|
|
||||||
"max": null,
|
|
||||||
"min": null,
|
|
||||||
"show": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"format": "short",
|
|
||||||
"label": null,
|
|
||||||
"logBase": 1,
|
|
||||||
"max": null,
|
|
||||||
"min": null,
|
|
||||||
"show": false
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"yaxis": {
|
|
||||||
"align": false,
|
|
||||||
"alignLevel": null
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"aliasColors": {},
|
|
||||||
"bars": false,
|
|
||||||
"dashLength": 10,
|
|
||||||
"dashes": false,
|
|
||||||
"datasource": "TDengine",
|
|
||||||
"fill": 1,
|
|
||||||
"fillGradient": 0,
|
|
||||||
"gridPos": {
|
|
||||||
"h": 11,
|
|
||||||
"w": 12,
|
|
||||||
"x": 12,
|
|
||||||
"y": 12
|
|
||||||
},
|
|
||||||
"id": 18,
|
|
||||||
"legend": {
|
|
||||||
"avg": false,
|
|
||||||
"current": false,
|
|
||||||
"max": false,
|
|
||||||
"min": false,
|
|
||||||
"show": true,
|
|
||||||
"total": false,
|
|
||||||
"values": false
|
|
||||||
},
|
|
||||||
"lines": true,
|
|
||||||
"linewidth": 1,
|
|
||||||
"nullPointMode": "null",
|
|
||||||
"options": {
|
|
||||||
"dataLinks": []
|
|
||||||
},
|
|
||||||
"percentage": false,
|
|
||||||
"pointradius": 2,
|
|
||||||
"points": false,
|
|
||||||
"renderer": "flot",
|
|
||||||
"seriesOverrides": [],
|
|
||||||
"spaceLength": 10,
|
|
||||||
"stack": false,
|
|
||||||
"steppedLine": false,
|
|
||||||
"targets": [
|
|
||||||
{
|
|
||||||
"alias": "",
|
|
||||||
"refId": "A",
|
|
||||||
"sql": "select avg(disk_used) disk_used from log.dn where ts >= $from and ts < $to interval(1s) group by ipaddr",
|
|
||||||
"target": "select metric",
|
|
||||||
"type": "timeserie"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"thresholds": [],
|
|
||||||
"timeFrom": null,
|
|
||||||
"timeRegions": [],
|
|
||||||
"timeShift": null,
|
|
||||||
"title": "avg_disk_used",
|
|
||||||
"tooltip": {
|
|
||||||
"shared": true,
|
|
||||||
"sort": 0,
|
|
||||||
"value_type": "individual"
|
|
||||||
},
|
|
||||||
"type": "graph",
|
|
||||||
"xaxis": {
|
|
||||||
"buckets": null,
|
|
||||||
"mode": "time",
|
|
||||||
"name": null,
|
|
||||||
"show": true,
|
|
||||||
"values": []
|
|
||||||
},
|
|
||||||
"yaxes": [
|
|
||||||
{
|
|
||||||
"format": "decgbytes",
|
|
||||||
"label": "",
|
|
||||||
"logBase": 1,
|
|
||||||
"max": null,
|
|
||||||
"min": null,
|
|
||||||
"show": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"format": "short",
|
|
||||||
"label": null,
|
|
||||||
"logBase": 1,
|
|
||||||
"max": null,
|
|
||||||
"min": null,
|
|
||||||
"show": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"yaxis": {
|
|
||||||
"align": false,
|
|
||||||
"alignLevel": null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"refresh": "5s",
|
|
||||||
"schemaVersion": 20,
|
|
||||||
"style": "dark",
|
|
||||||
"tags": [],
|
|
||||||
"templating": {
|
|
||||||
"list": []
|
|
||||||
},
|
|
||||||
"time": {
|
|
||||||
"from": "now-1h",
|
|
||||||
"to": "now"
|
|
||||||
},
|
|
||||||
"timepicker": {
|
|
||||||
"refresh_intervals": [
|
|
||||||
"5s",
|
|
||||||
"10s",
|
|
||||||
"30s",
|
|
||||||
"1m",
|
|
||||||
"5m",
|
|
||||||
"15m",
|
|
||||||
"30m",
|
|
||||||
"1h",
|
|
||||||
"2h",
|
|
||||||
"1d"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"timezone": "",
|
|
||||||
"title": "TDengine",
|
|
||||||
"uid": "FE-vpe0Wk",
|
|
||||||
"version": 1
|
|
||||||
}
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 173 KiB |
|
|
@ -1,96 +0,0 @@
|
||||||
TDengine Datasource - build by Taosdata Inc. www.taosdata.com
|
|
||||||
|
|
||||||
TDengine backend server implement 2 urls:
|
|
||||||
|
|
||||||
* `/heartbeat` return 200 ok. Used for "Test connection" on the datasource config page.
|
|
||||||
* `/query` return data based on input sqls.
|
|
||||||
|
|
||||||
## Installation
|
|
||||||
|
|
||||||
To install this plugin:
|
|
||||||
Copy the data source you want to /var/lib/grafana/plugins/. Then restart grafana-server. The new data source should now be available in the data source type dropdown in the Add Data Source View.
|
|
||||||
|
|
||||||
```
|
|
||||||
cp -r <tdengine-extrach-dir>/connector/grafana/tdengine /var/lib/grafana/plugins/
|
|
||||||
sudo service grafana-server restart
|
|
||||||
```
|
|
||||||
|
|
||||||
### Query API
|
|
||||||
|
|
||||||
Example request
|
|
||||||
``` javascript
|
|
||||||
[{
|
|
||||||
"refId": "A",
|
|
||||||
"alias": "taosd-memory",
|
|
||||||
"sql": "select avg(mem_taosd) from sys.dn where ts > now-5m and ts < now interval(500a)"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"refId": "B",
|
|
||||||
"alias": "system-memory",
|
|
||||||
"sql": "select avg(mem_system) from sys.dn where ts > now-5m and ts < now interval(500a)"
|
|
||||||
}]
|
|
||||||
```
|
|
||||||
|
|
||||||
Example response
|
|
||||||
``` javascript
|
|
||||||
[{
|
|
||||||
"datapoints": [
|
|
||||||
[206.488281, 1538137825000],
|
|
||||||
[206.488281, 1538137855000],
|
|
||||||
[206.488281, 1538137885500],
|
|
||||||
[210.609375, 1538137915500],
|
|
||||||
[210.867188, 1538137945500]
|
|
||||||
],
|
|
||||||
"refId": "A",
|
|
||||||
"target": "taosd-memory"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"datapoints": [
|
|
||||||
[2910.218750, 1538137825000],
|
|
||||||
[2912.265625, 1538137855000],
|
|
||||||
[2912.437500, 1538137885500],
|
|
||||||
[2916.644531, 1538137915500],
|
|
||||||
[2917.066406, 1538137945500]
|
|
||||||
],
|
|
||||||
"refId": "B",
|
|
||||||
"target": "system-memory"
|
|
||||||
}]
|
|
||||||
```
|
|
||||||
|
|
||||||
### Heartbeat API
|
|
||||||
|
|
||||||
Example request
|
|
||||||
``` javascript
|
|
||||||
Get request /heartbeat
|
|
||||||
```
|
|
||||||
|
|
||||||
Example response
|
|
||||||
``` javascript
|
|
||||||
{
|
|
||||||
"message": "Grafana server receive a quest from you!"
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### Dev setup
|
|
||||||
|
|
||||||
This plugin requires node 6.10.0
|
|
||||||
|
|
||||||
``` javascript
|
|
||||||
|
|
||||||
npm install -g yarn
|
|
||||||
yarn install
|
|
||||||
npm run build
|
|
||||||
|
|
||||||
```
|
|
||||||
|
|
||||||
### Import Dashboard
|
|
||||||
|
|
||||||
after login `http://localhost:3000 `, then you can import the tdengine demo dashboard to monitor the system metrics.
|
|
||||||
|
|
||||||
you can import the `dashboard/tdengine-grafana.json`:
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
after finished import:
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
.generic-datasource-query-row .query-keyword {
|
|
||||||
width: 75px;
|
|
||||||
}
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 98 KiB |
|
|
@ -1,588 +0,0 @@
|
||||||
{
|
|
||||||
"annotations": {
|
|
||||||
"list": [
|
|
||||||
{
|
|
||||||
"builtIn": 1,
|
|
||||||
"datasource": "-- Grafana --",
|
|
||||||
"enable": true,
|
|
||||||
"hide": true,
|
|
||||||
"iconColor": "rgba(0, 211, 255, 1)",
|
|
||||||
"name": "Annotations & Alerts",
|
|
||||||
"type": "dashboard"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"editable": true,
|
|
||||||
"gnetId": null,
|
|
||||||
"graphTooltip": 0,
|
|
||||||
"id": 3,
|
|
||||||
"links": [],
|
|
||||||
"panels": [
|
|
||||||
{
|
|
||||||
"cacheTimeout": null,
|
|
||||||
"colorBackground": false,
|
|
||||||
"colorValue": true,
|
|
||||||
"colors": [
|
|
||||||
"#299c46",
|
|
||||||
"rgba(237, 129, 40, 0.89)",
|
|
||||||
"#d44a3a"
|
|
||||||
],
|
|
||||||
"datasource": "TDengine",
|
|
||||||
"description": "total select request per minute last hour",
|
|
||||||
"format": "none",
|
|
||||||
"gauge": {
|
|
||||||
"maxValue": 100,
|
|
||||||
"minValue": 0,
|
|
||||||
"show": false,
|
|
||||||
"thresholdLabels": false,
|
|
||||||
"thresholdMarkers": true
|
|
||||||
},
|
|
||||||
"gridPos": {
|
|
||||||
"h": 6,
|
|
||||||
"w": 12,
|
|
||||||
"x": 0,
|
|
||||||
"y": 0
|
|
||||||
},
|
|
||||||
"id": 8,
|
|
||||||
"interval": null,
|
|
||||||
"links": [],
|
|
||||||
"mappingType": 1,
|
|
||||||
"mappingTypes": [
|
|
||||||
{
|
|
||||||
"name": "value to text",
|
|
||||||
"value": 1
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "range to text",
|
|
||||||
"value": 2
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"maxDataPoints": 100,
|
|
||||||
"nullPointMode": "connected",
|
|
||||||
"nullText": null,
|
|
||||||
"options": {},
|
|
||||||
"postfix": "次数/min",
|
|
||||||
"postfixFontSize": "20%",
|
|
||||||
"prefix": "",
|
|
||||||
"prefixFontSize": "50%",
|
|
||||||
"rangeMaps": [
|
|
||||||
{
|
|
||||||
"from": "null",
|
|
||||||
"text": "N/A",
|
|
||||||
"to": "null"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"sparkline": {
|
|
||||||
"fillColor": "rgba(31, 118, 189, 0.18)",
|
|
||||||
"full": true,
|
|
||||||
"lineColor": "rgb(31, 120, 193)",
|
|
||||||
"show": true,
|
|
||||||
"ymax": null,
|
|
||||||
"ymin": null
|
|
||||||
},
|
|
||||||
"tableColumn": "",
|
|
||||||
"targets": [
|
|
||||||
{
|
|
||||||
"alias": "req_select",
|
|
||||||
"refId": "A",
|
|
||||||
"sql": "select sum(req_select) from log.dn where ts >= now-1h and ts < now interval(1m)",
|
|
||||||
"target": "select metric",
|
|
||||||
"type": "timeserie"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"thresholds": "120,240",
|
|
||||||
"timeFrom": null,
|
|
||||||
"timeShift": null,
|
|
||||||
"title": "req select",
|
|
||||||
"type": "singlestat",
|
|
||||||
"valueFontSize": "150%",
|
|
||||||
"valueMaps": [
|
|
||||||
{
|
|
||||||
"op": "=",
|
|
||||||
"text": "N/A",
|
|
||||||
"value": "null"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"valueName": "total"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"cacheTimeout": null,
|
|
||||||
"colorBackground": false,
|
|
||||||
"colorValue": true,
|
|
||||||
"colors": [
|
|
||||||
"#299c46",
|
|
||||||
"rgba(237, 129, 40, 0.89)",
|
|
||||||
"#d44a3a"
|
|
||||||
],
|
|
||||||
"datasource": "TDengine",
|
|
||||||
"description": "total insert request per minute for last hour",
|
|
||||||
"format": "none",
|
|
||||||
"gauge": {
|
|
||||||
"maxValue": 100,
|
|
||||||
"minValue": 0,
|
|
||||||
"show": false,
|
|
||||||
"thresholdLabels": false,
|
|
||||||
"thresholdMarkers": true
|
|
||||||
},
|
|
||||||
"gridPos": {
|
|
||||||
"h": 6,
|
|
||||||
"w": 12,
|
|
||||||
"x": 12,
|
|
||||||
"y": 0
|
|
||||||
},
|
|
||||||
"id": 6,
|
|
||||||
"interval": null,
|
|
||||||
"links": [],
|
|
||||||
"mappingType": 1,
|
|
||||||
"mappingTypes": [
|
|
||||||
{
|
|
||||||
"name": "value to text",
|
|
||||||
"value": 1
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "range to text",
|
|
||||||
"value": 2
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"maxDataPoints": 100,
|
|
||||||
"nullPointMode": "connected",
|
|
||||||
"nullText": null,
|
|
||||||
"options": {},
|
|
||||||
"postfix": "次数/min",
|
|
||||||
"postfixFontSize": "20%",
|
|
||||||
"prefix": "",
|
|
||||||
"prefixFontSize": "50%",
|
|
||||||
"rangeMaps": [
|
|
||||||
{
|
|
||||||
"from": "null",
|
|
||||||
"text": "N/A",
|
|
||||||
"to": "null"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"sparkline": {
|
|
||||||
"fillColor": "rgba(31, 118, 189, 0.18)",
|
|
||||||
"full": false,
|
|
||||||
"lineColor": "rgb(31, 120, 193)",
|
|
||||||
"show": true,
|
|
||||||
"ymax": null,
|
|
||||||
"ymin": null
|
|
||||||
},
|
|
||||||
"tableColumn": "",
|
|
||||||
"targets": [
|
|
||||||
{
|
|
||||||
"alias": "req_insert",
|
|
||||||
"refId": "A",
|
|
||||||
"sql": "select sum(req_insert) from log.dn where ts >= now-1h and ts < now interval(1m)",
|
|
||||||
"target": "select metric",
|
|
||||||
"type": "timeserie"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"thresholds": "110,240",
|
|
||||||
"timeFrom": null,
|
|
||||||
"timeShift": null,
|
|
||||||
"title": "req insert",
|
|
||||||
"type": "singlestat",
|
|
||||||
"valueFontSize": "150%",
|
|
||||||
"valueMaps": [
|
|
||||||
{
|
|
||||||
"op": "=",
|
|
||||||
"text": "N/A",
|
|
||||||
"value": "null"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"valueName": "total"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"datasource": "TDengine",
|
|
||||||
"description": "taosd max memery last 10 minutes",
|
|
||||||
"gridPos": {
|
|
||||||
"h": 6,
|
|
||||||
"w": 8,
|
|
||||||
"x": 0,
|
|
||||||
"y": 6
|
|
||||||
},
|
|
||||||
"id": 12,
|
|
||||||
"options": {
|
|
||||||
"fieldOptions": {
|
|
||||||
"calcs": [
|
|
||||||
"mean"
|
|
||||||
],
|
|
||||||
"defaults": {
|
|
||||||
"mappings": [],
|
|
||||||
"max": 4096,
|
|
||||||
"min": 0,
|
|
||||||
"thresholds": [
|
|
||||||
{
|
|
||||||
"color": "green",
|
|
||||||
"value": null
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"color": "red",
|
|
||||||
"value": 80
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"color": "#EAB839",
|
|
||||||
"value": 2048
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"unit": "decmbytes"
|
|
||||||
},
|
|
||||||
"override": {},
|
|
||||||
"values": false
|
|
||||||
},
|
|
||||||
"orientation": "auto",
|
|
||||||
"showThresholdLabels": true,
|
|
||||||
"showThresholdMarkers": true
|
|
||||||
},
|
|
||||||
"pluginVersion": "6.4.3",
|
|
||||||
"targets": [
|
|
||||||
{
|
|
||||||
"alias": "mem_taosd",
|
|
||||||
"refId": "A",
|
|
||||||
"sql": "select max(mem_taosd) from log.dn where ts >= now -10m and ts < now",
|
|
||||||
"target": "select metric",
|
|
||||||
"type": "timeserie"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"timeFrom": null,
|
|
||||||
"timeShift": null,
|
|
||||||
"title": "taosd memery",
|
|
||||||
"type": "gauge"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"datasource": "TDengine",
|
|
||||||
"description": "max System Memory last 1 hour",
|
|
||||||
"gridPos": {
|
|
||||||
"h": 6,
|
|
||||||
"w": 8,
|
|
||||||
"x": 8,
|
|
||||||
"y": 6
|
|
||||||
},
|
|
||||||
"id": 10,
|
|
||||||
"options": {
|
|
||||||
"fieldOptions": {
|
|
||||||
"calcs": [
|
|
||||||
"last"
|
|
||||||
],
|
|
||||||
"defaults": {
|
|
||||||
"mappings": [],
|
|
||||||
"max": 4,
|
|
||||||
"min": 0,
|
|
||||||
"thresholds": [
|
|
||||||
{
|
|
||||||
"color": "green",
|
|
||||||
"value": null
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"color": "semi-dark-orange",
|
|
||||||
"value": 60
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"color": "dark-red",
|
|
||||||
"value": 80
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"title": "",
|
|
||||||
"unit": "decmbytes"
|
|
||||||
},
|
|
||||||
"override": {},
|
|
||||||
"values": false
|
|
||||||
},
|
|
||||||
"orientation": "auto",
|
|
||||||
"showThresholdLabels": true,
|
|
||||||
"showThresholdMarkers": true
|
|
||||||
},
|
|
||||||
"pluginVersion": "6.4.3",
|
|
||||||
"targets": [
|
|
||||||
{
|
|
||||||
"alias": "mem_system",
|
|
||||||
"refId": "A",
|
|
||||||
"sql": "select max(mem_system) from log.dn where ts >= now -10h and ts < now",
|
|
||||||
"target": "select metric",
|
|
||||||
"type": "timeserie"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"timeFrom": null,
|
|
||||||
"timeShift": null,
|
|
||||||
"title": "system memory",
|
|
||||||
"type": "gauge"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"datasource": "TDengine",
|
|
||||||
"description": "avg band speed last one minute",
|
|
||||||
"gridPos": {
|
|
||||||
"h": 6,
|
|
||||||
"w": 8,
|
|
||||||
"x": 16,
|
|
||||||
"y": 6
|
|
||||||
},
|
|
||||||
"id": 14,
|
|
||||||
"options": {
|
|
||||||
"fieldOptions": {
|
|
||||||
"calcs": [
|
|
||||||
"last"
|
|
||||||
],
|
|
||||||
"defaults": {
|
|
||||||
"mappings": [],
|
|
||||||
"max": 8192,
|
|
||||||
"min": 0,
|
|
||||||
"thresholds": [
|
|
||||||
{
|
|
||||||
"color": "green",
|
|
||||||
"value": null
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"color": "#EAB839",
|
|
||||||
"value": 4916
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"color": "red",
|
|
||||||
"value": 6554
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"unit": "Kbits"
|
|
||||||
},
|
|
||||||
"override": {},
|
|
||||||
"values": false
|
|
||||||
},
|
|
||||||
"orientation": "auto",
|
|
||||||
"showThresholdLabels": true,
|
|
||||||
"showThresholdMarkers": true
|
|
||||||
},
|
|
||||||
"pluginVersion": "6.4.3",
|
|
||||||
"targets": [
|
|
||||||
{
|
|
||||||
"alias": "band_speed",
|
|
||||||
"refId": "A",
|
|
||||||
"sql": "select avg(band_speed) from log.dn where ts >= now-1h and ts < now interval(1m)",
|
|
||||||
"target": "select metric",
|
|
||||||
"type": "timeserie"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"timeFrom": null,
|
|
||||||
"timeShift": null,
|
|
||||||
"title": "band speed",
|
|
||||||
"type": "gauge"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"aliasColors": {},
|
|
||||||
"bars": false,
|
|
||||||
"cacheTimeout": null,
|
|
||||||
"dashLength": 10,
|
|
||||||
"dashes": false,
|
|
||||||
"datasource": "TDengine",
|
|
||||||
"description": "monitor system cpu",
|
|
||||||
"fill": 1,
|
|
||||||
"fillGradient": 0,
|
|
||||||
"gridPos": {
|
|
||||||
"h": 11,
|
|
||||||
"w": 12,
|
|
||||||
"x": 0,
|
|
||||||
"y": 12
|
|
||||||
},
|
|
||||||
"hideTimeOverride": true,
|
|
||||||
"id": 2,
|
|
||||||
"legend": {
|
|
||||||
"avg": false,
|
|
||||||
"current": false,
|
|
||||||
"max": false,
|
|
||||||
"min": false,
|
|
||||||
"show": true,
|
|
||||||
"total": false,
|
|
||||||
"values": false
|
|
||||||
},
|
|
||||||
"lines": true,
|
|
||||||
"linewidth": 1,
|
|
||||||
"links": [],
|
|
||||||
"nullPointMode": "null",
|
|
||||||
"options": {
|
|
||||||
"dataLinks": []
|
|
||||||
},
|
|
||||||
"percentage": false,
|
|
||||||
"pluginVersion": "6.4.3",
|
|
||||||
"pointradius": 2,
|
|
||||||
"points": false,
|
|
||||||
"renderer": "flot",
|
|
||||||
"seriesOverrides": [],
|
|
||||||
"spaceLength": 10,
|
|
||||||
"stack": false,
|
|
||||||
"steppedLine": false,
|
|
||||||
"targets": [
|
|
||||||
{
|
|
||||||
"alias": "cpu_system11",
|
|
||||||
"hide": false,
|
|
||||||
"refId": "A",
|
|
||||||
"sql": "select avg(cpu_system) from log.dn where ts >= now-1h and ts < now interval(1s)",
|
|
||||||
"target": "select metric",
|
|
||||||
"type": "timeserie"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"alias": "cpu_taosd",
|
|
||||||
"hide": false,
|
|
||||||
"refId": "B",
|
|
||||||
"sql": "select avg(cpu_taosd) from log.dn where ts >= now-1h and ts < now interval(1s)",
|
|
||||||
"target": "select metric",
|
|
||||||
"type": "timeserie"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"thresholds": [],
|
|
||||||
"timeFrom": "1h",
|
|
||||||
"timeRegions": [],
|
|
||||||
"timeShift": "30s",
|
|
||||||
"title": "cpu_system",
|
|
||||||
"tooltip": {
|
|
||||||
"shared": true,
|
|
||||||
"sort": 0,
|
|
||||||
"value_type": "individual"
|
|
||||||
},
|
|
||||||
"type": "graph",
|
|
||||||
"xaxis": {
|
|
||||||
"buckets": null,
|
|
||||||
"mode": "time",
|
|
||||||
"name": null,
|
|
||||||
"show": true,
|
|
||||||
"values": []
|
|
||||||
},
|
|
||||||
"yaxes": [
|
|
||||||
{
|
|
||||||
"decimals": null,
|
|
||||||
"format": "percent",
|
|
||||||
"label": "使用占比",
|
|
||||||
"logBase": 1,
|
|
||||||
"max": null,
|
|
||||||
"min": null,
|
|
||||||
"show": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"format": "short",
|
|
||||||
"label": null,
|
|
||||||
"logBase": 1,
|
|
||||||
"max": null,
|
|
||||||
"min": null,
|
|
||||||
"show": false
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"yaxis": {
|
|
||||||
"align": false,
|
|
||||||
"alignLevel": null
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"aliasColors": {},
|
|
||||||
"bars": false,
|
|
||||||
"dashLength": 10,
|
|
||||||
"dashes": false,
|
|
||||||
"datasource": "TDengine",
|
|
||||||
"fill": 1,
|
|
||||||
"fillGradient": 0,
|
|
||||||
"gridPos": {
|
|
||||||
"h": 11,
|
|
||||||
"w": 12,
|
|
||||||
"x": 12,
|
|
||||||
"y": 12
|
|
||||||
},
|
|
||||||
"id": 18,
|
|
||||||
"legend": {
|
|
||||||
"avg": false,
|
|
||||||
"current": false,
|
|
||||||
"max": false,
|
|
||||||
"min": false,
|
|
||||||
"show": true,
|
|
||||||
"total": false,
|
|
||||||
"values": false
|
|
||||||
},
|
|
||||||
"lines": true,
|
|
||||||
"linewidth": 1,
|
|
||||||
"nullPointMode": "null",
|
|
||||||
"options": {
|
|
||||||
"dataLinks": []
|
|
||||||
},
|
|
||||||
"percentage": false,
|
|
||||||
"pointradius": 2,
|
|
||||||
"points": false,
|
|
||||||
"renderer": "flot",
|
|
||||||
"seriesOverrides": [],
|
|
||||||
"spaceLength": 10,
|
|
||||||
"stack": false,
|
|
||||||
"steppedLine": false,
|
|
||||||
"targets": [
|
|
||||||
{
|
|
||||||
"alias": "",
|
|
||||||
"refId": "A",
|
|
||||||
"sql": "select avg(disk_used) disk_used from log.dn where ts >= $from and ts < $to interval(1s) group by ipaddr",
|
|
||||||
"target": "select metric",
|
|
||||||
"type": "timeserie"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"thresholds": [],
|
|
||||||
"timeFrom": null,
|
|
||||||
"timeRegions": [],
|
|
||||||
"timeShift": null,
|
|
||||||
"title": "avg_disk_used",
|
|
||||||
"tooltip": {
|
|
||||||
"shared": true,
|
|
||||||
"sort": 0,
|
|
||||||
"value_type": "individual"
|
|
||||||
},
|
|
||||||
"type": "graph",
|
|
||||||
"xaxis": {
|
|
||||||
"buckets": null,
|
|
||||||
"mode": "time",
|
|
||||||
"name": null,
|
|
||||||
"show": true,
|
|
||||||
"values": []
|
|
||||||
},
|
|
||||||
"yaxes": [
|
|
||||||
{
|
|
||||||
"format": "decgbytes",
|
|
||||||
"label": "",
|
|
||||||
"logBase": 1,
|
|
||||||
"max": null,
|
|
||||||
"min": null,
|
|
||||||
"show": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"format": "short",
|
|
||||||
"label": null,
|
|
||||||
"logBase": 1,
|
|
||||||
"max": null,
|
|
||||||
"min": null,
|
|
||||||
"show": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"yaxis": {
|
|
||||||
"align": false,
|
|
||||||
"alignLevel": null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"refresh": "5s",
|
|
||||||
"schemaVersion": 20,
|
|
||||||
"style": "dark",
|
|
||||||
"tags": [],
|
|
||||||
"templating": {
|
|
||||||
"list": []
|
|
||||||
},
|
|
||||||
"time": {
|
|
||||||
"from": "now-1h",
|
|
||||||
"to": "now"
|
|
||||||
},
|
|
||||||
"timepicker": {
|
|
||||||
"refresh_intervals": [
|
|
||||||
"5s",
|
|
||||||
"10s",
|
|
||||||
"30s",
|
|
||||||
"1m",
|
|
||||||
"5m",
|
|
||||||
"15m",
|
|
||||||
"30m",
|
|
||||||
"1h",
|
|
||||||
"2h",
|
|
||||||
"1d"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"timezone": "",
|
|
||||||
"title": "TDengine",
|
|
||||||
"uid": "FE-vpe0Wk",
|
|
||||||
"version": 1
|
|
||||||
}
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 173 KiB |
|
|
@ -1,156 +0,0 @@
|
||||||
'use strict';
|
|
||||||
|
|
||||||
Object.defineProperty(exports, "__esModule", {
|
|
||||||
value: true
|
|
||||||
});
|
|
||||||
exports.GenericDatasource = undefined;
|
|
||||||
|
|
||||||
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
|
|
||||||
|
|
||||||
var _lodash = require('lodash');
|
|
||||||
|
|
||||||
var _lodash2 = _interopRequireDefault(_lodash);
|
|
||||||
|
|
||||||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
||||||
|
|
||||||
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
||||||
|
|
||||||
var GenericDatasource = exports.GenericDatasource = function () {
|
|
||||||
function GenericDatasource(instanceSettings, $q, backendSrv, templateSrv) {
|
|
||||||
_classCallCheck(this, GenericDatasource);
|
|
||||||
|
|
||||||
this.type = instanceSettings.type;
|
|
||||||
this.url = instanceSettings.url;
|
|
||||||
this.name = instanceSettings.name;
|
|
||||||
this.q = $q;
|
|
||||||
this.backendSrv = backendSrv;
|
|
||||||
this.templateSrv = templateSrv;
|
|
||||||
this.headers = { 'Content-Type': 'application/json' };
|
|
||||||
this.headers.Authorization = this.getAuthorization(instanceSettings.jsonData);
|
|
||||||
}
|
|
||||||
|
|
||||||
_createClass(GenericDatasource, [{
|
|
||||||
key: 'query',
|
|
||||||
value: function query(options) {
|
|
||||||
var targets = this.buildQueryParameters(options);
|
|
||||||
|
|
||||||
if (targets.length <= 0) {
|
|
||||||
return this.q.when({ data: [] });
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.doRequest({
|
|
||||||
url: this.url + '/grafana/query',
|
|
||||||
data: targets,
|
|
||||||
method: 'POST'
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}, {
|
|
||||||
key: 'testDatasource',
|
|
||||||
value: function testDatasource() {
|
|
||||||
return this.doRequest({
|
|
||||||
url: this.url + '/grafana/heartbeat',
|
|
||||||
method: 'GET'
|
|
||||||
}).then(function (response) {
|
|
||||||
if (response.status === 200) {
|
|
||||||
return { status: "success", message: "TDengine Data source is working", title: "Success" };
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}, {
|
|
||||||
key: 'doRequest',
|
|
||||||
value: function doRequest(options) {
|
|
||||||
options.headers = this.headers;
|
|
||||||
|
|
||||||
return this.backendSrv.datasourceRequest(options);
|
|
||||||
}
|
|
||||||
}, {
|
|
||||||
key: 'buildQueryParameters',
|
|
||||||
value: function buildQueryParameters(options) {
|
|
||||||
var _this = this;
|
|
||||||
|
|
||||||
var targets = _lodash2.default.map(options.targets, function (target) {
|
|
||||||
return {
|
|
||||||
refId: target.refId,
|
|
||||||
alias: _this.generateAlias(options, target),
|
|
||||||
sql: _this.generateSql(options, target)
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
return targets;
|
|
||||||
}
|
|
||||||
}, {
|
|
||||||
key: 'encode',
|
|
||||||
value: function encode(input) {
|
|
||||||
var _keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
|
|
||||||
var output = "";
|
|
||||||
var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
|
|
||||||
var i = 0;
|
|
||||||
while (i < input.length) {
|
|
||||||
chr1 = input.charCodeAt(i++);
|
|
||||||
chr2 = input.charCodeAt(i++);
|
|
||||||
chr3 = input.charCodeAt(i++);
|
|
||||||
enc1 = chr1 >> 2;
|
|
||||||
enc2 = (chr1 & 3) << 4 | chr2 >> 4;
|
|
||||||
enc3 = (chr2 & 15) << 2 | chr3 >> 6;
|
|
||||||
enc4 = chr3 & 63;
|
|
||||||
if (isNaN(chr2)) {
|
|
||||||
enc3 = enc4 = 64;
|
|
||||||
} else if (isNaN(chr3)) {
|
|
||||||
enc4 = 64;
|
|
||||||
}
|
|
||||||
output = output + _keyStr.charAt(enc1) + _keyStr.charAt(enc2) + _keyStr.charAt(enc3) + _keyStr.charAt(enc4);
|
|
||||||
}
|
|
||||||
|
|
||||||
return output;
|
|
||||||
}
|
|
||||||
}, {
|
|
||||||
key: 'getAuthorization',
|
|
||||||
value: function getAuthorization(jsonData) {
|
|
||||||
jsonData = jsonData || {};
|
|
||||||
var defaultUser = jsonData.user || "root";
|
|
||||||
var defaultPassword = jsonData.password || "taosdata";
|
|
||||||
|
|
||||||
return "Basic " + this.encode(defaultUser + ":" + defaultPassword);
|
|
||||||
}
|
|
||||||
}, {
|
|
||||||
key: 'generateAlias',
|
|
||||||
value: function generateAlias(options, target) {
|
|
||||||
var alias = target.alias || "";
|
|
||||||
alias = this.templateSrv.replace(alias, options.scopedVars, 'csv');
|
|
||||||
return alias;
|
|
||||||
}
|
|
||||||
}, {
|
|
||||||
key: 'generateSql',
|
|
||||||
value: function generateSql(options, target) {
|
|
||||||
var sql = target.sql;
|
|
||||||
if (sql == null || sql == "") {
|
|
||||||
return sql;
|
|
||||||
}
|
|
||||||
|
|
||||||
var queryStart = "now-1h";
|
|
||||||
if (options != null && options.range != null && options.range.from != null) {
|
|
||||||
queryStart = options.range.from.toISOString();
|
|
||||||
}
|
|
||||||
|
|
||||||
var queryEnd = "now";
|
|
||||||
if (options != null && options.range != null && options.range.to != null) {
|
|
||||||
queryEnd = options.range.to.toISOString();
|
|
||||||
}
|
|
||||||
var intervalMs = options.intervalMs || "20000";
|
|
||||||
|
|
||||||
intervalMs += "a";
|
|
||||||
sql = sql.replace(/^\s+|\s+$/gm, '');
|
|
||||||
sql = sql.replace("$from", "'" + queryStart + "'");
|
|
||||||
sql = sql.replace("$begin", "'" + queryStart + "'");
|
|
||||||
sql = sql.replace("$to", "'" + queryEnd + "'");
|
|
||||||
sql = sql.replace("$end", "'" + queryEnd + "'");
|
|
||||||
sql = sql.replace("$interval", intervalMs);
|
|
||||||
|
|
||||||
sql = this.templateSrv.replace(sql, options.scopedVars, 'csv');
|
|
||||||
return sql;
|
|
||||||
}
|
|
||||||
}]);
|
|
||||||
|
|
||||||
return GenericDatasource;
|
|
||||||
}();
|
|
||||||
//# sourceMappingURL=datasource.js.map
|
|
||||||
File diff suppressed because one or more lines are too long
Binary file not shown.
|
Before Width: | Height: | Size: 3.1 KiB |
|
|
@ -1,37 +0,0 @@
|
||||||
'use strict';
|
|
||||||
|
|
||||||
Object.defineProperty(exports, "__esModule", {
|
|
||||||
value: true
|
|
||||||
});
|
|
||||||
exports.AnnotationsQueryCtrl = exports.QueryOptionsCtrl = exports.ConfigCtrl = exports.QueryCtrl = exports.Datasource = undefined;
|
|
||||||
|
|
||||||
var _datasource = require('./datasource');
|
|
||||||
|
|
||||||
var _query_ctrl = require('./query_ctrl');
|
|
||||||
|
|
||||||
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
||||||
|
|
||||||
var GenericConfigCtrl = function GenericConfigCtrl() {
|
|
||||||
_classCallCheck(this, GenericConfigCtrl);
|
|
||||||
};
|
|
||||||
|
|
||||||
GenericConfigCtrl.templateUrl = 'partials/config.html';
|
|
||||||
|
|
||||||
var GenericQueryOptionsCtrl = function GenericQueryOptionsCtrl() {
|
|
||||||
_classCallCheck(this, GenericQueryOptionsCtrl);
|
|
||||||
};
|
|
||||||
|
|
||||||
GenericQueryOptionsCtrl.templateUrl = 'partials/query.options.html';
|
|
||||||
|
|
||||||
var GenericAnnotationsQueryCtrl = function GenericAnnotationsQueryCtrl() {
|
|
||||||
_classCallCheck(this, GenericAnnotationsQueryCtrl);
|
|
||||||
};
|
|
||||||
|
|
||||||
GenericAnnotationsQueryCtrl.templateUrl = 'partials/annotations.editor.html';
|
|
||||||
|
|
||||||
exports.Datasource = _datasource.GenericDatasource;
|
|
||||||
exports.QueryCtrl = _query_ctrl.GenericDatasourceQueryCtrl;
|
|
||||||
exports.ConfigCtrl = GenericConfigCtrl;
|
|
||||||
exports.QueryOptionsCtrl = GenericQueryOptionsCtrl;
|
|
||||||
exports.AnnotationsQueryCtrl = GenericAnnotationsQueryCtrl;
|
|
||||||
//# sourceMappingURL=module.js.map
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
{"version":3,"sources":["../src/module.js"],"names":["GenericConfigCtrl","templateUrl","GenericQueryOptionsCtrl","GenericAnnotationsQueryCtrl","Datasource","GenericDatasource","QueryCtrl","GenericDatasourceQueryCtrl","ConfigCtrl","QueryOptionsCtrl","AnnotationsQueryCtrl"],"mappings":";;;;;;;AAAA;;AACA;;;;IAEMA,iB;;;;AACNA,kBAAkBC,WAAlB,GAAgC,sBAAhC;;IAEMC,uB;;;;AACNA,wBAAwBD,WAAxB,GAAsC,6BAAtC;;IAEME,2B;;;;AACNA,4BAA4BF,WAA5B,GAA0C,kCAA1C;;QAGuBG,U,GAArBC,6B;QAC8BC,S,GAA9BC,sC;QACqBC,U,GAArBR,iB;QAC2BS,gB,GAA3BP,uB;QAC+BQ,oB,GAA/BP,2B","file":"module.js","sourcesContent":["import {GenericDatasource} from './datasource';\nimport {GenericDatasourceQueryCtrl} from './query_ctrl';\n\nclass GenericConfigCtrl {}\nGenericConfigCtrl.templateUrl = 'partials/config.html';\n\nclass GenericQueryOptionsCtrl {}\nGenericQueryOptionsCtrl.templateUrl = 'partials/query.options.html';\n\nclass GenericAnnotationsQueryCtrl {}\nGenericAnnotationsQueryCtrl.templateUrl = 'partials/annotations.editor.html'\n\nexport {\n GenericDatasource as Datasource,\n GenericDatasourceQueryCtrl as QueryCtrl,\n GenericConfigCtrl as ConfigCtrl,\n GenericQueryOptionsCtrl as QueryOptionsCtrl,\n GenericAnnotationsQueryCtrl as AnnotationsQueryCtrl\n};\n"]}
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
<h3 class="page-heading">TDengine Connection</h3>
|
|
||||||
|
|
||||||
<div class="gf-form-group">
|
|
||||||
<div class="gf-form max-width-30">
|
|
||||||
<span class="gf-form-label width-7">Host</span>
|
|
||||||
<input type="text" class="gf-form-input" ng-model='ctrl.current.url' placeholder="http://localhost:6041" bs-typeahead="{{['http://localhost:6041']}}" required></input>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="gf-form-inline">
|
|
||||||
<div class="gf-form max-width-15">
|
|
||||||
<span class="gf-form-label width-7">User</span>
|
|
||||||
<input type="text" class="gf-form-input" ng-model='ctrl.current.jsonData.user' placeholder="root"></input>
|
|
||||||
</div>
|
|
||||||
<div class="gf-form max-width-15">
|
|
||||||
<span class="gf-form-label width-7">Password</span>
|
|
||||||
<input type="password" class="gf-form-input" ng-model='ctrl.current.jsonData.password' placeholder="taosdata"></input>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
@ -1,58 +0,0 @@
|
||||||
<query-editor-row query-ctrl="ctrl" can-collapse="true" >
|
|
||||||
|
|
||||||
<div class="gf-form-inline">
|
|
||||||
<div class="gf-form gf-form--grow">
|
|
||||||
<label class="gf-form-label query-keyword width-7">INPUT SQL</label>
|
|
||||||
<input type="text" class="gf-form-input" ng-model="ctrl.target.sql" spellcheck='false' placeholder="select avg(mem_system) from log.dn where ts >= $from and ts < $to interval($interval)" ng-blur="ctrl.panelCtrl.refresh()" data-mode="sql"></input>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="gf-form-inline">
|
|
||||||
<div class="gf-form-inline" ng-hide="ctrl.target.resultFormat === 'table'">
|
|
||||||
<div class="gf-form max-width-30">
|
|
||||||
<label class="gf-form-label query-keyword width-7">ALIAS BY</label>
|
|
||||||
<input type="text" class="gf-form-input" ng-model="ctrl.target.alias" spellcheck='false' placeholder="Naming pattern" ng-blur="ctrl.panelCtrl.refresh()">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="gf-form">
|
|
||||||
<label class="gf-form-label query-keyword" ng-click="ctrl.generateSQL()">
|
|
||||||
GENERATE SQL
|
|
||||||
<i class="fa fa-caret-down" ng-show="ctrl.showGenerateSQL"></i>
|
|
||||||
<i class="fa fa-caret-right" ng-hide="ctrl.showGenerateSQL"></i>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="gf-form">
|
|
||||||
<label class="gf-form-label query-keyword" ng-click="ctrl.showHelp = !ctrl.showHelp">
|
|
||||||
SHOW HELP
|
|
||||||
<i class="fa fa-caret-down" ng-show="ctrl.showHelp"></i>
|
|
||||||
<i class="fa fa-caret-right" ng-hide="ctrl.showHelp"></i>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="gf-form" ng-show="ctrl.showGenerateSQL">
|
|
||||||
<pre class="gf-form-pre">{{ctrl.lastGenerateSQL}}</pre>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="gf-form" ng-show="ctrl.showHelp">
|
|
||||||
<pre class="gf-form-pre alert alert-info">Use any SQL that can return Resultset such as:
|
|
||||||
- [[timestamp1, value1], [timestamp2, value2], ... ]
|
|
||||||
|
|
||||||
Macros:
|
|
||||||
- $from -> start timestamp of panel
|
|
||||||
- $to -> stop timestamp of panel
|
|
||||||
- $interval -> interval of panel
|
|
||||||
|
|
||||||
Example of SQL:
|
|
||||||
SELECT count(*)
|
|
||||||
FROM db.table
|
|
||||||
WHERE ts > $from and ts < $to
|
|
||||||
INTERVAL ($interval)
|
|
||||||
</pre>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="gf-form" ng-show="ctrl.lastQueryError">
|
|
||||||
<pre class="gf-form-pre alert alert-error">{{ctrl.lastQueryError}}</pre>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</query-editor-row>
|
|
||||||
|
|
@ -1,35 +0,0 @@
|
||||||
{
|
|
||||||
"name": "TDengine",
|
|
||||||
"id": "taosdata-tdengine-datasource",
|
|
||||||
"type": "datasource",
|
|
||||||
|
|
||||||
"partials": {
|
|
||||||
"config": "partials/config.html"
|
|
||||||
},
|
|
||||||
|
|
||||||
"metrics": true,
|
|
||||||
"annotations": false,
|
|
||||||
|
|
||||||
"info": {
|
|
||||||
"description": "grafana datasource plugin for tdengine",
|
|
||||||
"author": {
|
|
||||||
"name": "Taosdata Inc.",
|
|
||||||
"url": "https://www.taosdata.com"
|
|
||||||
},
|
|
||||||
"logos": {
|
|
||||||
"small": "img/taosdata_logo.png",
|
|
||||||
"large": "img/taosdata_logo.png"
|
|
||||||
},
|
|
||||||
"links": [
|
|
||||||
{"name": "GitHub", "url": "https://github.com/taosdata/TDengine/tree/develop/src/connector/grafana/tdengine"},
|
|
||||||
{"name": "AGPL 3.0", "url": "https://github.com/taosdata/TDengine/tree/develop/src/connector/grafana/tdengine/LICENSE"}
|
|
||||||
],
|
|
||||||
"version": "1.0.0",
|
|
||||||
"updated": "2020-01-13"
|
|
||||||
},
|
|
||||||
|
|
||||||
"dependencies": {
|
|
||||||
"grafanaVersion": "5.2.4",
|
|
||||||
"plugins": [ ]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,51 +0,0 @@
|
||||||
'use strict';
|
|
||||||
|
|
||||||
Object.defineProperty(exports, "__esModule", {
|
|
||||||
value: true
|
|
||||||
});
|
|
||||||
exports.GenericDatasourceQueryCtrl = undefined;
|
|
||||||
|
|
||||||
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
|
|
||||||
|
|
||||||
var _sdk = require('app/plugins/sdk');
|
|
||||||
|
|
||||||
require('./css/query-editor.css!');
|
|
||||||
|
|
||||||
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
||||||
|
|
||||||
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
|
|
||||||
|
|
||||||
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
|
|
||||||
|
|
||||||
var GenericDatasourceQueryCtrl = exports.GenericDatasourceQueryCtrl = function (_QueryCtrl) {
|
|
||||||
_inherits(GenericDatasourceQueryCtrl, _QueryCtrl);
|
|
||||||
|
|
||||||
function GenericDatasourceQueryCtrl($scope, $injector) {
|
|
||||||
_classCallCheck(this, GenericDatasourceQueryCtrl);
|
|
||||||
|
|
||||||
var _this = _possibleConstructorReturn(this, (GenericDatasourceQueryCtrl.__proto__ || Object.getPrototypeOf(GenericDatasourceQueryCtrl)).call(this, $scope, $injector));
|
|
||||||
|
|
||||||
_this.scope = $scope;
|
|
||||||
_this.target.target = _this.target.target || 'select metric';
|
|
||||||
_this.target.type = _this.target.type || 'timeserie';
|
|
||||||
return _this;
|
|
||||||
}
|
|
||||||
|
|
||||||
_createClass(GenericDatasourceQueryCtrl, [{
|
|
||||||
key: 'onChangeInternal',
|
|
||||||
value: function onChangeInternal() {
|
|
||||||
this.panelCtrl.refresh(); // Asks the panel to refresh data.
|
|
||||||
}
|
|
||||||
}, {
|
|
||||||
key: 'generateSQL',
|
|
||||||
value: function generateSQL(query) {
|
|
||||||
this.lastGenerateSQL = this.datasource.generateSql(this.panelCtrl, this.target);
|
|
||||||
this.showGenerateSQL = !this.showGenerateSQL;
|
|
||||||
}
|
|
||||||
}]);
|
|
||||||
|
|
||||||
return GenericDatasourceQueryCtrl;
|
|
||||||
}(_sdk.QueryCtrl);
|
|
||||||
|
|
||||||
GenericDatasourceQueryCtrl.templateUrl = 'partials/query.editor.html';
|
|
||||||
//# sourceMappingURL=query_ctrl.js.map
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
{"version":3,"sources":["../src/query_ctrl.js"],"names":["GenericDatasourceQueryCtrl","$scope","$injector","scope","target","type","panelCtrl","refresh","query","lastGenerateSQL","datasource","generateSql","showGenerateSQL","QueryCtrl","templateUrl"],"mappings":";;;;;;;;;AAAA;;AACA;;;;;;;;IAEaA,0B,WAAAA,0B;;;AAEX,sCAAYC,MAAZ,EAAoBC,SAApB,EAAgC;AAAA;;AAAA,wJACxBD,MADwB,EAChBC,SADgB;;AAG9B,UAAKC,KAAL,GAAaF,MAAb;AACA,UAAKG,MAAL,CAAYA,MAAZ,GAAqB,MAAKA,MAAL,CAAYA,MAAZ,IAAsB,eAA3C;AACA,UAAKA,MAAL,CAAYC,IAAZ,GAAmB,MAAKD,MAAL,CAAYC,IAAZ,IAAoB,WAAvC;AAL8B;AAM/B;;;;uCAEkB;AACjB,WAAKC,SAAL,CAAeC,OAAf,GADiB,CACS;AAC3B;;;gCAEWC,K,EAAO;AACjB,WAAKC,eAAL,GAAuB,KAAKC,UAAL,CAAgBC,WAAhB,CAA6B,KAAKL,SAAlC,EAA6C,KAAKF,MAAlD,CAAvB;AACA,WAAKQ,eAAL,GAAuB,CAAC,KAAKA,eAA7B;AACD;;;;EAjB6CC,c;;AAqBhDb,2BAA2Bc,WAA3B,GAAyC,4BAAzC","file":"query_ctrl.js","sourcesContent":["import {QueryCtrl} from 'app/plugins/sdk';\nimport './css/query-editor.css!'\n\nexport class GenericDatasourceQueryCtrl extends QueryCtrl {\n\n constructor($scope, $injector) {\n super($scope, $injector);\n\n this.scope = $scope;\n this.target.target = this.target.target || 'select metric';\n this.target.type = this.target.type || 'timeserie';\n }\n\n onChangeInternal() {\n this.panelCtrl.refresh(); // Asks the panel to refresh data.\n }\n\n generateSQL(query) {\n this.lastGenerateSQL = this.datasource.generateSql( this.panelCtrl, this.target);\n this.showGenerateSQL = !this.showGenerateSQL;\n }\n\n}\n\nGenericDatasourceQueryCtrl.templateUrl = 'partials/query.editor.html';"]}
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,45 +0,0 @@
|
||||||
{
|
|
||||||
"name": "TDengine",
|
|
||||||
"private": false,
|
|
||||||
"version": "2.0.0",
|
|
||||||
"description": "grafana datasource plugin for tdengine",
|
|
||||||
"scripts": {
|
|
||||||
"build": "./node_modules/grunt-cli/bin/grunt",
|
|
||||||
"test": "./node_modules/grunt-cli/bin/grunt mochaTest"
|
|
||||||
},
|
|
||||||
"repository": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "git+https://github.com/taosdata/TDengine.git"
|
|
||||||
},
|
|
||||||
"author": "https://www.taosdata.com",
|
|
||||||
"license": "AGPL 3.0",
|
|
||||||
"bugs": {
|
|
||||||
"url": "https://github.com/taosdata/TDengine/issues"
|
|
||||||
},
|
|
||||||
"engineStrict": true,
|
|
||||||
"devDependencies": {
|
|
||||||
"babel": "^6.23.0",
|
|
||||||
"babel-plugin-transform-object-rest-spread": "^6.26.0",
|
|
||||||
"babel-preset-env": "^1.7.0",
|
|
||||||
"chai": "~3.5.0",
|
|
||||||
"grunt": "^1.0.4",
|
|
||||||
"grunt-babel": "~6.0.0",
|
|
||||||
"grunt-cli": "^1.2.0",
|
|
||||||
"grunt-contrib-clean": "^1.1.0",
|
|
||||||
"grunt-contrib-copy": "^1.0.0",
|
|
||||||
"grunt-contrib-uglify": "^2.3.0",
|
|
||||||
"grunt-contrib-watch": "^1.0.0",
|
|
||||||
"grunt-mocha-test": "^0.13.2",
|
|
||||||
"grunt-systemjs-builder": "^1.0.0",
|
|
||||||
"jsdom": "~9.12.0",
|
|
||||||
"load-grunt-tasks": "^3.5.2",
|
|
||||||
"mocha": "^6.2.2",
|
|
||||||
"prunk": "^1.3.0",
|
|
||||||
"q": "^1.5.0"
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"lodash": "^4.17.19",
|
|
||||||
"yarn": "^1.22.0"
|
|
||||||
},
|
|
||||||
"homepage": "https://github.com/taosdata/TDengine/tree/develop/src/connector/grafana/tdengine"
|
|
||||||
}
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
import {Datasource} from "../module";
|
|
||||||
import Q from "q";
|
|
||||||
|
|
||||||
describe('GenericDatasource', function() {
|
|
||||||
var ctx = {};
|
|
||||||
|
|
||||||
beforeEach(function() {
|
|
||||||
ctx.$q = Q;
|
|
||||||
ctx.backendSrv = {};
|
|
||||||
ctx.templateSrv = {};
|
|
||||||
ctx.ds = new Datasource({}, ctx.$q, ctx.backendSrv, ctx.templateSrv);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should return an empty array when no targets are set', function(done) {
|
|
||||||
ctx.ds.query({targets: []}).then(function(result) {
|
|
||||||
expect(result.data).to.have.length(0);
|
|
||||||
done();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
import prunk from 'prunk';
|
|
||||||
import {jsdom} from 'jsdom';
|
|
||||||
import chai from 'chai';
|
|
||||||
|
|
||||||
// Mock Grafana modules that are not available outside of the core project
|
|
||||||
// Required for loading module.js
|
|
||||||
prunk.mock('./css/query-editor.css!', 'no css, dude.');
|
|
||||||
prunk.mock('app/plugins/sdk', {
|
|
||||||
QueryCtrl: null
|
|
||||||
});
|
|
||||||
|
|
||||||
// Setup jsdom
|
|
||||||
// Required for loading angularjs
|
|
||||||
global.document = jsdom('<html><head><script></script></head><body></body></html>');
|
|
||||||
global.window = global.document.parentWindow;
|
|
||||||
|
|
||||||
// Setup Chai
|
|
||||||
chai.should();
|
|
||||||
global.assert = chai.assert;
|
|
||||||
global.expect = chai.expect;
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
.generic-datasource-query-row .query-keyword {
|
|
||||||
width: 75px;
|
|
||||||
}
|
|
||||||
|
|
@ -1,127 +0,0 @@
|
||||||
import _ from "lodash";
|
|
||||||
|
|
||||||
export class GenericDatasource {
|
|
||||||
|
|
||||||
constructor(instanceSettings, $q, backendSrv, templateSrv) {
|
|
||||||
this.type = instanceSettings.type;
|
|
||||||
this.url = instanceSettings.url;
|
|
||||||
this.name = instanceSettings.name;
|
|
||||||
this.q = $q;
|
|
||||||
this.backendSrv = backendSrv;
|
|
||||||
this.templateSrv = templateSrv;
|
|
||||||
this.headers = {'Content-Type': 'application/json'};
|
|
||||||
this.headers.Authorization = this.getAuthorization(instanceSettings.jsonData);
|
|
||||||
}
|
|
||||||
|
|
||||||
query(options) {
|
|
||||||
var targets = this.buildQueryParameters(options);
|
|
||||||
|
|
||||||
if (targets.length <= 0) {
|
|
||||||
return this.q.when({data: []});
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.doRequest({
|
|
||||||
url: this.url + '/grafana/query',
|
|
||||||
data: targets,
|
|
||||||
method: 'POST'
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
testDatasource() {
|
|
||||||
return this.doRequest({
|
|
||||||
url: this.url + '/grafana/heartbeat',
|
|
||||||
method: 'GET',
|
|
||||||
}).then(response => {
|
|
||||||
if (response.status === 200) {
|
|
||||||
return { status: "success", message: "TDengine Data source is working", title: "Success" };
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
doRequest(options) {
|
|
||||||
options.headers = this.headers;
|
|
||||||
|
|
||||||
return this.backendSrv.datasourceRequest(options);
|
|
||||||
}
|
|
||||||
|
|
||||||
buildQueryParameters(options) {
|
|
||||||
|
|
||||||
var targets = _.map(options.targets, target => {
|
|
||||||
return {
|
|
||||||
refId: target.refId,
|
|
||||||
alias: this.generateAlias(options, target),
|
|
||||||
sql: this.generateSql(options, target)
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
return targets;
|
|
||||||
}
|
|
||||||
|
|
||||||
encode(input) {
|
|
||||||
var _keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
|
|
||||||
var output = "";
|
|
||||||
var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
|
|
||||||
var i = 0;
|
|
||||||
while (i < input.length) {
|
|
||||||
chr1 = input.charCodeAt(i++);
|
|
||||||
chr2 = input.charCodeAt(i++);
|
|
||||||
chr3 = input.charCodeAt(i++);
|
|
||||||
enc1 = chr1 >> 2;
|
|
||||||
enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
|
|
||||||
enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
|
|
||||||
enc4 = chr3 & 63;
|
|
||||||
if (isNaN(chr2)) {
|
|
||||||
enc3 = enc4 = 64;
|
|
||||||
} else if (isNaN(chr3)) {
|
|
||||||
enc4 = 64;
|
|
||||||
}
|
|
||||||
output = output + _keyStr.charAt(enc1) + _keyStr.charAt(enc2) + _keyStr.charAt(enc3) + _keyStr.charAt(enc4);
|
|
||||||
}
|
|
||||||
|
|
||||||
return output;
|
|
||||||
}
|
|
||||||
|
|
||||||
getAuthorization(jsonData){
|
|
||||||
jsonData = jsonData || {};
|
|
||||||
var defaultUser = jsonData.user || "root";
|
|
||||||
var defaultPassword = jsonData.password || "taosdata";
|
|
||||||
|
|
||||||
return "Basic " + this.encode(defaultUser + ":" + defaultPassword);
|
|
||||||
}
|
|
||||||
|
|
||||||
generateAlias(options, target){
|
|
||||||
var alias = target.alias || "";
|
|
||||||
alias = this.templateSrv.replace(alias, options.scopedVars, 'csv');
|
|
||||||
return alias;
|
|
||||||
}
|
|
||||||
|
|
||||||
generateSql(options, target) {
|
|
||||||
var sql = target.sql;
|
|
||||||
if (sql == null || sql == ""){
|
|
||||||
return sql;
|
|
||||||
}
|
|
||||||
|
|
||||||
var queryStart = "now-1h";
|
|
||||||
if (options != null && options.range != null && options.range.from != null){
|
|
||||||
queryStart = options.range.from.toISOString();
|
|
||||||
}
|
|
||||||
|
|
||||||
var queryEnd = "now";
|
|
||||||
if (options != null && options.range != null && options.range.to != null){
|
|
||||||
queryEnd = options.range.to.toISOString();
|
|
||||||
}
|
|
||||||
var intervalMs = options.intervalMs || "20000";
|
|
||||||
|
|
||||||
intervalMs += "a";
|
|
||||||
sql = sql.replace(/^\s+|\s+$/gm, '');
|
|
||||||
sql = sql.replace("$from", "'" + queryStart + "'");
|
|
||||||
sql = sql.replace("$begin", "'" + queryStart + "'");
|
|
||||||
sql = sql.replace("$to", "'" + queryEnd + "'");
|
|
||||||
sql = sql.replace("$end", "'" + queryEnd + "'");
|
|
||||||
sql = sql.replace("$interval", intervalMs);
|
|
||||||
|
|
||||||
sql = this.templateSrv.replace(sql, options.scopedVars, 'csv');
|
|
||||||
return sql;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 3.1 KiB |
|
|
@ -1,19 +0,0 @@
|
||||||
import {GenericDatasource} from './datasource';
|
|
||||||
import {GenericDatasourceQueryCtrl} from './query_ctrl';
|
|
||||||
|
|
||||||
class GenericConfigCtrl {}
|
|
||||||
GenericConfigCtrl.templateUrl = 'partials/config.html';
|
|
||||||
|
|
||||||
class GenericQueryOptionsCtrl {}
|
|
||||||
GenericQueryOptionsCtrl.templateUrl = 'partials/query.options.html';
|
|
||||||
|
|
||||||
class GenericAnnotationsQueryCtrl {}
|
|
||||||
GenericAnnotationsQueryCtrl.templateUrl = 'partials/annotations.editor.html'
|
|
||||||
|
|
||||||
export {
|
|
||||||
GenericDatasource as Datasource,
|
|
||||||
GenericDatasourceQueryCtrl as QueryCtrl,
|
|
||||||
GenericConfigCtrl as ConfigCtrl,
|
|
||||||
GenericQueryOptionsCtrl as QueryOptionsCtrl,
|
|
||||||
GenericAnnotationsQueryCtrl as AnnotationsQueryCtrl
|
|
||||||
};
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
<h3 class="page-heading">TDengine Connection</h3>
|
|
||||||
|
|
||||||
<div class="gf-form-group">
|
|
||||||
<div class="gf-form max-width-30">
|
|
||||||
<span class="gf-form-label width-7">Host</span>
|
|
||||||
<input type="text" class="gf-form-input" ng-model='ctrl.current.url' placeholder="http://localhost:6041" bs-typeahead="{{['http://localhost:6041']}}" required></input>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="gf-form-inline">
|
|
||||||
<div class="gf-form max-width-15">
|
|
||||||
<span class="gf-form-label width-7">User</span>
|
|
||||||
<input type="text" class="gf-form-input" ng-model='ctrl.current.jsonData.user' placeholder="root"></input>
|
|
||||||
</div>
|
|
||||||
<div class="gf-form max-width-15">
|
|
||||||
<span class="gf-form-label width-7">Password</span>
|
|
||||||
<input type="password" class="gf-form-input" ng-model='ctrl.current.jsonData.password' placeholder="taosdata"></input>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
@ -1,58 +0,0 @@
|
||||||
<query-editor-row query-ctrl="ctrl" can-collapse="true" >
|
|
||||||
|
|
||||||
<div class="gf-form-inline">
|
|
||||||
<div class="gf-form gf-form--grow">
|
|
||||||
<label class="gf-form-label query-keyword width-7">INPUT SQL</label>
|
|
||||||
<input type="text" class="gf-form-input" ng-model="ctrl.target.sql" spellcheck='false' placeholder="select avg(mem_system) from log.dn where ts >= $from and ts < $to interval($interval)" ng-blur="ctrl.panelCtrl.refresh()" data-mode="sql"></input>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="gf-form-inline">
|
|
||||||
<div class="gf-form-inline" ng-hide="ctrl.target.resultFormat === 'table'">
|
|
||||||
<div class="gf-form max-width-30">
|
|
||||||
<label class="gf-form-label query-keyword width-7">ALIAS BY</label>
|
|
||||||
<input type="text" class="gf-form-input" ng-model="ctrl.target.alias" spellcheck='false' placeholder="Naming pattern" ng-blur="ctrl.panelCtrl.refresh()">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="gf-form">
|
|
||||||
<label class="gf-form-label query-keyword" ng-click="ctrl.generateSQL()">
|
|
||||||
GENERATE SQL
|
|
||||||
<i class="fa fa-caret-down" ng-show="ctrl.showGenerateSQL"></i>
|
|
||||||
<i class="fa fa-caret-right" ng-hide="ctrl.showGenerateSQL"></i>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="gf-form">
|
|
||||||
<label class="gf-form-label query-keyword" ng-click="ctrl.showHelp = !ctrl.showHelp">
|
|
||||||
SHOW HELP
|
|
||||||
<i class="fa fa-caret-down" ng-show="ctrl.showHelp"></i>
|
|
||||||
<i class="fa fa-caret-right" ng-hide="ctrl.showHelp"></i>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="gf-form" ng-show="ctrl.showGenerateSQL">
|
|
||||||
<pre class="gf-form-pre">{{ctrl.lastGenerateSQL}}</pre>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="gf-form" ng-show="ctrl.showHelp">
|
|
||||||
<pre class="gf-form-pre alert alert-info">Use any SQL that can return Resultset such as:
|
|
||||||
- [[timestamp1, value1], [timestamp2, value2], ... ]
|
|
||||||
|
|
||||||
Macros:
|
|
||||||
- $from -> start timestamp of panel
|
|
||||||
- $to -> stop timestamp of panel
|
|
||||||
- $interval -> interval of panel
|
|
||||||
|
|
||||||
Example of SQL:
|
|
||||||
SELECT count(*)
|
|
||||||
FROM db.table
|
|
||||||
WHERE ts > $from and ts < $to
|
|
||||||
INTERVAL ($interval)
|
|
||||||
</pre>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="gf-form" ng-show="ctrl.lastQueryError">
|
|
||||||
<pre class="gf-form-pre alert alert-error">{{ctrl.lastQueryError}}</pre>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</query-editor-row>
|
|
||||||
|
|
@ -1,35 +0,0 @@
|
||||||
{
|
|
||||||
"name": "TDengine",
|
|
||||||
"id": "taosdata-tdengine-datasource",
|
|
||||||
"type": "datasource",
|
|
||||||
|
|
||||||
"partials": {
|
|
||||||
"config": "partials/config.html"
|
|
||||||
},
|
|
||||||
|
|
||||||
"metrics": true,
|
|
||||||
"annotations": false,
|
|
||||||
|
|
||||||
"info": {
|
|
||||||
"description": "grafana datasource plugin for tdengine",
|
|
||||||
"author": {
|
|
||||||
"name": "Taosdata Inc.",
|
|
||||||
"url": "https://www.taosdata.com"
|
|
||||||
},
|
|
||||||
"logos": {
|
|
||||||
"small": "img/taosdata_logo.png",
|
|
||||||
"large": "img/taosdata_logo.png"
|
|
||||||
},
|
|
||||||
"links": [
|
|
||||||
{"name": "GitHub", "url": "https://github.com/taosdata/TDengine/tree/develop/src/connector/grafana/tdengine"},
|
|
||||||
{"name": "AGPL 3.0", "url": "https://github.com/taosdata/TDengine/tree/develop/src/connector/grafana/tdengine/LICENSE"}
|
|
||||||
],
|
|
||||||
"version": "1.0.0",
|
|
||||||
"updated": "2020-01-13"
|
|
||||||
},
|
|
||||||
|
|
||||||
"dependencies": {
|
|
||||||
"grafanaVersion": "5.2.4",
|
|
||||||
"plugins": [ ]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
import {QueryCtrl} from 'app/plugins/sdk';
|
|
||||||
import './css/query-editor.css!'
|
|
||||||
|
|
||||||
export class GenericDatasourceQueryCtrl extends QueryCtrl {
|
|
||||||
|
|
||||||
constructor($scope, $injector) {
|
|
||||||
super($scope, $injector);
|
|
||||||
|
|
||||||
this.scope = $scope;
|
|
||||||
this.target.target = this.target.target || 'select metric';
|
|
||||||
this.target.type = this.target.type || 'timeserie';
|
|
||||||
}
|
|
||||||
|
|
||||||
onChangeInternal() {
|
|
||||||
this.panelCtrl.refresh(); // Asks the panel to refresh data.
|
|
||||||
}
|
|
||||||
|
|
||||||
generateSQL(query) {
|
|
||||||
this.lastGenerateSQL = this.datasource.generateSql( this.panelCtrl, this.target);
|
|
||||||
this.showGenerateSQL = !this.showGenerateSQL;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
GenericDatasourceQueryCtrl.templateUrl = 'partials/query.editor.html';
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit d598db167eb256fe67409b7bb3d0eb7fffc3ff8c
|
||||||
|
|
@ -111,6 +111,8 @@ public class TSDBJNIConnector {
|
||||||
* @throws SQLException
|
* @throws SQLException
|
||||||
*/
|
*/
|
||||||
public long executeQuery(String sql) throws SQLException {
|
public long executeQuery(String sql) throws SQLException {
|
||||||
|
// close previous result set if the user forgets to invoke the
|
||||||
|
// free method to close previous result set.
|
||||||
if (!this.isResultsetClosed) {
|
if (!this.isResultsetClosed) {
|
||||||
freeResultSet(taosResultSetPointer);
|
freeResultSet(taosResultSetPointer);
|
||||||
}
|
}
|
||||||
|
|
@ -123,21 +125,20 @@ public class TSDBJNIConnector {
|
||||||
this.freeResultSet(pSql);
|
this.freeResultSet(pSql);
|
||||||
throw new SQLException(TSDBConstants.WrapErrMsg("Unsupported encoding"));
|
throw new SQLException(TSDBConstants.WrapErrMsg("Unsupported encoding"));
|
||||||
}
|
}
|
||||||
|
|
||||||
int code = this.getErrCode(pSql);
|
int code = this.getErrCode(pSql);
|
||||||
if (code != 0) {
|
if (code != 0) {
|
||||||
affectedRows = -1;
|
affectedRows = -1;
|
||||||
String err_msg = this.getErrMsg(pSql);
|
String msg = this.getErrMsg(pSql);
|
||||||
|
|
||||||
this.freeResultSet(pSql);
|
this.freeResultSet(pSql);
|
||||||
throw new SQLException(TSDBConstants.WrapErrMsg(err_msg), "", code);
|
throw new SQLException(TSDBConstants.WrapErrMsg(msg), "", code);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Try retrieving result set for the executed SQL using the current connection pointer. If the executed
|
// Try retrieving result set for the executed SQL using the current connection pointer.
|
||||||
// SQL is a DML/DDL which doesn't return a result set, then taosResultSetPointer should be 0L. Otherwise,
|
|
||||||
// taosResultSetPointer should be a non-zero value.
|
|
||||||
taosResultSetPointer = this.getResultSetImp(this.taos, pSql);
|
taosResultSetPointer = this.getResultSetImp(this.taos, pSql);
|
||||||
if (taosResultSetPointer != TSDBConstants.JNI_NULL_POINTER) {
|
isResultsetClosed = (taosResultSetPointer == TSDBConstants.JNI_NULL_POINTER);
|
||||||
isResultsetClosed = false;
|
|
||||||
}
|
|
||||||
return pSql;
|
return pSql;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -171,6 +172,12 @@ public class TSDBJNIConnector {
|
||||||
|
|
||||||
private native long getResultSetImp(long connection, long pSql);
|
private native long getResultSetImp(long connection, long pSql);
|
||||||
|
|
||||||
|
public boolean isUpdateQuery(long pSql) {
|
||||||
|
return isUpdateQueryImp(this.taos, pSql) == 1? true:false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private native long isUpdateQueryImp(long connection, long pSql);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Free resultset operation from C to release resultset pointer by JNI
|
* Free resultset operation from C to release resultset pointer by JNI
|
||||||
*/
|
*/
|
||||||
|
|
@ -178,13 +185,14 @@ public class TSDBJNIConnector {
|
||||||
int res = TSDBConstants.JNI_SUCCESS;
|
int res = TSDBConstants.JNI_SUCCESS;
|
||||||
if (result != taosResultSetPointer && taosResultSetPointer != TSDBConstants.JNI_NULL_POINTER) {
|
if (result != taosResultSetPointer && taosResultSetPointer != TSDBConstants.JNI_NULL_POINTER) {
|
||||||
throw new RuntimeException("Invalid result set pointer");
|
throw new RuntimeException("Invalid result set pointer");
|
||||||
} else if (taosResultSetPointer != TSDBConstants.JNI_NULL_POINTER) {
|
|
||||||
res = this.freeResultSetImp(this.taos, result);
|
|
||||||
isResultsetClosed = true; // reset resultSetPointer to 0 after freeResultSetImp() return
|
|
||||||
taosResultSetPointer = TSDBConstants.JNI_NULL_POINTER;
|
|
||||||
} else {
|
|
||||||
isResultsetClosed = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (taosResultSetPointer != TSDBConstants.JNI_NULL_POINTER) {
|
||||||
|
res = this.freeResultSetImp(this.taos, result);
|
||||||
|
taosResultSetPointer = TSDBConstants.JNI_NULL_POINTER;
|
||||||
|
}
|
||||||
|
|
||||||
|
isResultsetClosed = true;
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,7 @@ public class TSDBStatement implements Statement {
|
||||||
* Status of current statement
|
* Status of current statement
|
||||||
*/
|
*/
|
||||||
private boolean isClosed = true;
|
private boolean isClosed = true;
|
||||||
|
private int affectedRows = 0;
|
||||||
|
|
||||||
TSDBStatement(TSDBJNIConnector connecter) {
|
TSDBStatement(TSDBJNIConnector connecter) {
|
||||||
this.connecter = connecter;
|
this.connecter = connecter;
|
||||||
|
|
@ -51,6 +52,8 @@ public class TSDBStatement implements Statement {
|
||||||
if (isClosed) {
|
if (isClosed) {
|
||||||
throw new SQLException("Invalid method call on a closed statement.");
|
throw new SQLException("Invalid method call on a closed statement.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO make sure it is not a update query
|
||||||
pSql = this.connecter.executeQuery(sql);
|
pSql = this.connecter.executeQuery(sql);
|
||||||
|
|
||||||
long resultSetPointer = this.connecter.getResultSet();
|
long resultSetPointer = this.connecter.getResultSet();
|
||||||
|
|
@ -58,33 +61,41 @@ public class TSDBStatement implements Statement {
|
||||||
if (resultSetPointer == TSDBConstants.JNI_CONNECTION_NULL) {
|
if (resultSetPointer == TSDBConstants.JNI_CONNECTION_NULL) {
|
||||||
this.connecter.freeResultSet(pSql);
|
this.connecter.freeResultSet(pSql);
|
||||||
throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
|
throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
|
||||||
} else if (resultSetPointer == TSDBConstants.JNI_NULL_POINTER) {
|
}
|
||||||
// create/insert/update/del/alter
|
|
||||||
|
// create/insert/update/delete/alter
|
||||||
|
if (resultSetPointer == TSDBConstants.JNI_NULL_POINTER) {
|
||||||
this.connecter.freeResultSet(pSql);
|
this.connecter.freeResultSet(pSql);
|
||||||
return null;
|
return null;
|
||||||
} else {
|
|
||||||
return new TSDBResultSet(this.connecter, resultSetPointer);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!this.connecter.isUpdateQuery(pSql)) {
|
||||||
|
return new TSDBResultSet(this.connecter, resultSetPointer);
|
||||||
|
} else {
|
||||||
|
this.connecter.freeResultSet(pSql);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public int executeUpdate(String sql) throws SQLException {
|
public int executeUpdate(String sql) throws SQLException {
|
||||||
if (isClosed) {
|
if (isClosed) {
|
||||||
throw new SQLException("Invalid method call on a closed statement.");
|
throw new SQLException("Invalid method call on a closed statement.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO check if current query is update query
|
||||||
pSql = this.connecter.executeQuery(sql);
|
pSql = this.connecter.executeQuery(sql);
|
||||||
long resultSetPointer = this.connecter.getResultSet();
|
long resultSetPointer = this.connecter.getResultSet();
|
||||||
|
|
||||||
if (resultSetPointer == TSDBConstants.JNI_CONNECTION_NULL) {
|
if (resultSetPointer == TSDBConstants.JNI_CONNECTION_NULL) {
|
||||||
this.connecter.freeResultSet(pSql);
|
this.connecter.freeResultSet(pSql);
|
||||||
throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
|
throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
|
||||||
} else if (resultSetPointer != TSDBConstants.JNI_NULL_POINTER) {
|
|
||||||
this.connecter.freeResultSet();
|
|
||||||
throw new SQLException("The executed SQL is not a DML or a DDL");
|
|
||||||
} else {
|
|
||||||
int num = this.connecter.getAffectedRows(pSql);
|
|
||||||
this.connecter.freeResultSet(pSql);
|
|
||||||
return num;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.affectedRows = this.connecter.getAffectedRows(pSql);
|
||||||
|
this.connecter.freeResultSet(pSql);
|
||||||
|
|
||||||
|
return this.affectedRows;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getErrorMsg(long pSql) {
|
public String getErrorMsg(long pSql) {
|
||||||
|
|
@ -181,7 +192,8 @@ public class TSDBStatement implements Statement {
|
||||||
if (isClosed) {
|
if (isClosed) {
|
||||||
throw new SQLException("Invalid method call on a closed statement.");
|
throw new SQLException("Invalid method call on a closed statement.");
|
||||||
}
|
}
|
||||||
return this.connecter.getAffectedRows(this.pSql);
|
|
||||||
|
return this.affectedRows;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean getMoreResults() throws SQLException {
|
public boolean getMoreResults() throws SQLException {
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,10 @@ AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src SRC)
|
||||||
|
|
||||||
IF (TD_LINUX)
|
IF (TD_LINUX)
|
||||||
ADD_LIBRARY(tcq ${SRC})
|
ADD_LIBRARY(tcq ${SRC})
|
||||||
TARGET_LINK_LIBRARIES(tcq tutil common taos)
|
IF (TD_SOMODE_STATIC)
|
||||||
|
TARGET_LINK_LIBRARIES(tcq tutil common taos_static)
|
||||||
|
ELSE ()
|
||||||
|
TARGET_LINK_LIBRARIES(tcq tutil common taos)
|
||||||
|
ENDIF ()
|
||||||
ADD_SUBDIRECTORY(test)
|
ADD_SUBDIRECTORY(test)
|
||||||
ENDIF ()
|
ENDIF ()
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,11 @@ AUX_SOURCE_DIRECTORY(src SRC)
|
||||||
|
|
||||||
IF (TD_LINUX)
|
IF (TD_LINUX)
|
||||||
ADD_EXECUTABLE(taosd ${SRC})
|
ADD_EXECUTABLE(taosd ${SRC})
|
||||||
TARGET_LINK_LIBRARIES(taosd mnode taos monitor http mqtt tsdb twal vnode cJson lz4 balance sync)
|
IF (TD_SOMODE_STATIC)
|
||||||
|
TARGET_LINK_LIBRARIES(taosd mnode taos_static monitor http mqtt tsdb twal vnode cJson lz4 balance sync)
|
||||||
|
ELSE ()
|
||||||
|
TARGET_LINK_LIBRARIES(taosd mnode taos monitor http mqtt tsdb twal vnode cJson lz4 balance sync)
|
||||||
|
ENDIF ()
|
||||||
|
|
||||||
IF (TD_ACCOUNT)
|
IF (TD_ACCOUNT)
|
||||||
TARGET_LINK_LIBRARIES(taosd account)
|
TARGET_LINK_LIBRARIES(taosd account)
|
||||||
|
|
|
||||||
|
|
@ -11,11 +11,11 @@ IF (TD_LINUX)
|
||||||
LIST(REMOVE_ITEM SRC ./src/shellDarwin.c)
|
LIST(REMOVE_ITEM SRC ./src/shellDarwin.c)
|
||||||
ADD_EXECUTABLE(shell ${SRC})
|
ADD_EXECUTABLE(shell ${SRC})
|
||||||
|
|
||||||
# IF (TD_PAGMODE_LITE)
|
IF (TD_SOMODE_STATIC)
|
||||||
|
TARGET_LINK_LIBRARIES(shell taos_static)
|
||||||
|
ELSE ()
|
||||||
TARGET_LINK_LIBRARIES(shell taos)
|
TARGET_LINK_LIBRARIES(shell taos)
|
||||||
# ELSE ()
|
ENDIF ()
|
||||||
# TARGET_LINK_LIBRARIES(shell taos_static)
|
|
||||||
# ENDIF ()
|
|
||||||
|
|
||||||
SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos)
|
SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos)
|
||||||
ELSEIF (TD_WINDOWS)
|
ELSEIF (TD_WINDOWS)
|
||||||
|
|
|
||||||
|
|
@ -8,11 +8,11 @@ IF (TD_LINUX)
|
||||||
AUX_SOURCE_DIRECTORY(. SRC)
|
AUX_SOURCE_DIRECTORY(. SRC)
|
||||||
ADD_EXECUTABLE(taosdemo ${SRC})
|
ADD_EXECUTABLE(taosdemo ${SRC})
|
||||||
|
|
||||||
# IF (TD_PAGMODE_LITE)
|
IF (TD_SOMODE_STATIC)
|
||||||
|
TARGET_LINK_LIBRARIES(taosdemo taos_static)
|
||||||
|
ELSE ()
|
||||||
TARGET_LINK_LIBRARIES(taosdemo taos)
|
TARGET_LINK_LIBRARIES(taosdemo taos)
|
||||||
# ELSE ()
|
ENDIF ()
|
||||||
# TARGET_LINK_LIBRARIES(taosdemo taos_static)
|
|
||||||
# ENDIF ()
|
|
||||||
ELSEIF (TD_WINDOWS)
|
ELSEIF (TD_WINDOWS)
|
||||||
AUX_SOURCE_DIRECTORY(. SRC)
|
AUX_SOURCE_DIRECTORY(. SRC)
|
||||||
ADD_EXECUTABLE(taosdemo ${SRC})
|
ADD_EXECUTABLE(taosdemo ${SRC})
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,12 @@ AUX_SOURCE_DIRECTORY(src SRC)
|
||||||
|
|
||||||
IF (TD_LINUX)
|
IF (TD_LINUX)
|
||||||
ADD_LIBRARY(http ${SRC})
|
ADD_LIBRARY(http ${SRC})
|
||||||
TARGET_LINK_LIBRARIES(http taos z)
|
|
||||||
|
IF (TD_SOMODE_STATIC)
|
||||||
|
TARGET_LINK_LIBRARIES(http taos_static z)
|
||||||
|
ELSE ()
|
||||||
|
TARGET_LINK_LIBRARIES(http taos z)
|
||||||
|
ENDIF ()
|
||||||
|
|
||||||
IF (TD_ADMIN)
|
IF (TD_ADMIN)
|
||||||
TARGET_LINK_LIBRARIES(http admin)
|
TARGET_LINK_LIBRARIES(http admin)
|
||||||
|
|
|
||||||
|
|
@ -8,5 +8,10 @@ IF (TD_LINUX)
|
||||||
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
|
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
|
||||||
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc)
|
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc)
|
||||||
ADD_LIBRARY(monitor ${SRC})
|
ADD_LIBRARY(monitor ${SRC})
|
||||||
TARGET_LINK_LIBRARIES(monitor taos)
|
|
||||||
|
IF (TD_SOMODE_STATIC)
|
||||||
|
TARGET_LINK_LIBRARIES(monitor taos_static)
|
||||||
|
ELSE ()
|
||||||
|
TARGET_LINK_LIBRARIES(monitor taos)
|
||||||
|
ENDIF ()
|
||||||
ENDIF ()
|
ENDIF ()
|
||||||
|
|
|
||||||
|
|
@ -10,8 +10,12 @@ IF (TD_LINUX)
|
||||||
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/MQTT-C/include)
|
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/MQTT-C/include)
|
||||||
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/MQTT-C/examples/templates)
|
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/MQTT-C/examples/templates)
|
||||||
ADD_LIBRARY(mqtt ${SRC})
|
ADD_LIBRARY(mqtt ${SRC})
|
||||||
TARGET_LINK_LIBRARIES(mqtt taos cJson mqttc)
|
|
||||||
|
|
||||||
|
IF (TD_SOMODE_STATIC)
|
||||||
|
TARGET_LINK_LIBRARIES(mqtt taos_static cJson mqttc)
|
||||||
|
ELSE ()
|
||||||
|
TARGET_LINK_LIBRARIES(mqtt taos cJson mqttc)
|
||||||
|
ENDIF ()
|
||||||
IF (TD_ADMIN)
|
IF (TD_ADMIN)
|
||||||
TARGET_LINK_LIBRARIES(mqtt admin cJson)
|
TARGET_LINK_LIBRARIES(mqtt admin cJson)
|
||||||
ENDIF ()
|
ENDIF ()
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
char version[12] = "2.0.1.0";
|
char version[12] = "2.0.1.1";
|
||||||
char compatible_version[12] = "2.0.0.0";
|
char compatible_version[12] = "2.0.0.0";
|
||||||
char gitinfo[48] = "7ac6c2b8de3cd66e180132fc1cf77715237308a1";
|
char gitinfo[48] = "ae1966332948147bacce3d32f9ad539ab8721db2";
|
||||||
char gitinfoOfInternal[48] = "e1e64838ece2b6dbe964ec3a39953455f354d930";
|
char gitinfoOfInternal[48] = "bf53767db56cedb1c484df83a1f10536f12647ad";
|
||||||
char buildinfo[64] = "Built by root at 2020-08-17 11:13";
|
char buildinfo[64] = "Built by root at 2020-08-20 15:46";
|
||||||
|
|
||||||
void libtaos_2_0_1_0_Linux_x64() {};
|
void libtaos_2_0_1_1_Linux_x64() {};
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue