Azure
/
logstash-output-kusto
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Feature/fix msrc (#78) 

* Upgrade libraries and fix MSRC
This commit is contained in:
Ramachandran A G 2024-09-23 10:31:12 +05:30 коммит произвёл GitHub
Родитель 7e4d38adc2
Коммит 73fe9c0948
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
4 изменённых файлов: 47 добавлений и 39 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
.github/workflows/build.yml поставляемый
Просмотреть файл

@ -64,7 +64,7 @@ jobs:
working-directory: 'kusto' working-directory: 'kusto'
- if: matrix.logstash.main == 'true' - if: matrix.logstash.main == 'true'
name: Upload gem name: Upload gem
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v4
with: with:
name: logstash-kusto.gem name: logstash-kusto.gem
path: 'kusto/logstash-kusto.gem' path: 'kusto/logstash-kusto.gem'
@ -98,7 +98,7 @@ jobs:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Download gem - name: Download gem
uses: actions/download-artifact@v2 uses: actions/download-artifact@v4
with: with:
name: logstash-kusto.gem name: logstash-kusto.gem
- name: Install logstash # taken from logstash's website https://www.elastic.co/guide/en/logstash/7.10/installing-logstash.html#_apt - name: Install logstash # taken from logstash's website https://www.elastic.co/guide/en/logstash/7.10/installing-logstash.html#_apt

2
README.md
Просмотреть файл

@ -81,6 +81,8 @@ export LS_JAVA_OPTS="-Dhttp.proxyHost=1.2.34 -Dhttp.proxyPort=8989 -Dhttps.prox
| Version | Release Date | Notes | | Version | Release Date | Notes |
| --- | --- | --- | | --- | --- | --- |
| 2.0.8 | 2024-10-23 | - Fix library deprecations, fix issues in the Azure Identity library |
| 2.0.7 | 2024-01-01 | - Update Kusto JAVA SDK |
| 2.0.3 | 2023-12-12 | - Make JSON mapping field optional. If not provided logstash output JSON attribute names will be used for column resolution | | 2.0.3 | 2023-12-12 | - Make JSON mapping field optional. If not provided logstash output JSON attribute names will be used for column resolution |
| 2.0.2 | 2023-11-28 | - Bugfix for the scenario where the plugin uses managed identity. Instead of providing the managed identity name as empty in the config,it can completely be skipped | | 2.0.2 | 2023-11-28 | - Bugfix for the scenario where the plugin uses managed identity. Instead of providing the managed identity name as empty in the config,it can completely be skipped |
| 2.0.0 | 2023-09-19 | - Upgrade to the latest Java SDK version [5.0.2](https://github.com/Azure/azure-kusto-java/releases/tag/v5.0.2). Tests have been performed on **__Logstash 8.5__** and up (Does not work with 6.x or 7.x versions of Logstash - For these versions use 1.x.x versions of logstash-output-kusto gem) - Fixes CVE's in common-text & outdated Jackson libraries | | 2.0.0 | 2023-09-19 | - Upgrade to the latest Java SDK version [5.0.2](https://github.com/Azure/azure-kusto-java/releases/tag/v5.0.2). Tests have been performed on **__Logstash 8.5__** and up (Does not work with 6.x or 7.x versions of Logstash - For these versions use 1.x.x versions of logstash-output-kusto gem) - Fixes CVE's in common-text & outdated Jackson libraries |

78
build.gradle
Просмотреть файл

@ -10,7 +10,13 @@ apply plugin: 'maven-publish'
// The gemspec contains the gem metadata to build and package the gem. The gradle build serves as a mechanism of getting these "vendor" files required for the gem. // The gemspec contains the gem metadata to build and package the gem. The gradle build serves as a mechanism of getting these "vendor" files required for the gem.
// The alternative is to use ruby-maven gem to package, but this runs into classpath conflicts/issues with the logstash plugin. // The alternative is to use ruby-maven gem to package, but this runs into classpath conflicts/issues with the logstash plugin.
group "org.logstash.outputs" group "org.logstash.outputs"
version Files.readAllLines(Paths.get("version")).first()
def versionFile = Paths.get("version")
if (Files.exists(versionFile)) {
version = Files.readAllLines(versionFile).first()
} else {
version = "2.0.7"
}
repositories { repositories {
mavenCentral() mavenCentral()
@ -23,16 +29,16 @@ repositories {
// update dependencies to bom azure-sdk-bom/1.2.24 // update dependencies to bom azure-sdk-bom/1.2.24
dependencies { dependencies {
implementation 'com.microsoft.azure.kusto:kusto-data:5.1.1' implementation 'com.microsoft.azure.kusto:kusto-data:5.2.0'
implementation 'com.microsoft.azure.kusto:kusto-ingest:5.1.1' implementation 'com.microsoft.azure.kusto:kusto-ingest:5.2.0'
implementation 'com.azure:azure-core-http-netty:1.15.0' implementation 'com.azure:azure-core-http-netty:1.15.1'
implementation 'com.azure:azure-core:1.49.0' implementation 'com.azure:azure-core:1.49.1'
implementation 'com.azure:azure-data-tables:12.4.1' implementation 'com.azure:azure-data-tables:12.4.2'
implementation 'com.azure:azure-identity:1.12.1' implementation 'com.azure:azure-identity:1.13.0'
implementation 'com.azure:azure-json:1.1.0' implementation 'com.azure:azure-json:1.1.0'
implementation 'com.azure:azure-storage-blob:12.26.0' implementation 'com.azure:azure-storage-blob:12.26.1'
implementation 'com.azure:azure-storage-common:12.25.0' implementation 'com.azure:azure-storage-common:12.25.1'
implementation 'com.azure:azure-storage-queue:12.21.0' implementation 'com.azure:azure-storage-queue:12.21.1'
implementation 'com.azure:azure-xml:1.0.0' implementation 'com.azure:azure-xml:1.0.0'
implementation 'com.fasterxml.jackson.core:jackson-annotations:2.16.0' implementation 'com.fasterxml.jackson.core:jackson-annotations:2.16.0'
implementation 'com.fasterxml.jackson.core:jackson-core:2.16.0' implementation 'com.fasterxml.jackson.core:jackson-core:2.16.0'
@ -50,30 +56,30 @@ dependencies {
implementation 'commons-logging:commons-logging:1.3.1' implementation 'commons-logging:commons-logging:1.3.1'
implementation 'io.github.resilience4j:resilience4j-core:1.7.1' implementation 'io.github.resilience4j:resilience4j-core:1.7.1'
implementation 'io.github.resilience4j:resilience4j-retry:1.7.1' implementation 'io.github.resilience4j:resilience4j-retry:1.7.1'
implementation 'io.netty:netty-buffer:4.1.108.Final' implementation 'io.netty:netty-buffer:4.1.110.Final'
implementation 'io.netty:netty-codec-dns:4.1.108.Final' implementation 'io.netty:netty-codec-dns:4.1.110.Final'
implementation 'io.netty:netty-codec-http2:4.1.108.Final' implementation 'io.netty:netty-codec-http2:4.1.110.Final'
implementation 'io.netty:netty-codec-http:4.1.108.Final' implementation 'io.netty:netty-codec-http:4.1.110.Final'
implementation 'io.netty:netty-codec-socks:4.1.108.Final' implementation 'io.netty:netty-codec-socks:4.1.110.Final'
implementation 'io.netty:netty-codec:4.1.108.Final' implementation 'io.netty:netty-codec:4.1.110.Final'
implementation 'io.netty:netty-common:4.1.108.Final' implementation 'io.netty:netty-common:4.1.110.Final'
implementation 'io.netty:netty-handler-proxy:4.1.108.Final' implementation 'io.netty:netty-handler-proxy:4.1.110.Final'
implementation 'io.netty:netty-handler:4.1.108.Final' implementation 'io.netty:netty-handler:4.1.110.Final'
implementation 'io.netty:netty-resolver-dns-classes-macos:4.1.108.Final' implementation 'io.netty:netty-resolver-dns-classes-macos:4.1.110.Final'
implementation 'io.netty:netty-resolver-dns-native-macos:4.1.108.Final:osx-x86_64' implementation 'io.netty:netty-resolver-dns-native-macos:4.1.110.Final:osx-x86_64'
implementation 'io.netty:netty-resolver-dns:4.1.108.Final' implementation 'io.netty:netty-resolver-dns:4.1.110.Final'
implementation 'io.netty:netty-resolver:4.1.108.Final' implementation 'io.netty:netty-resolver:4.1.110.Final'
implementation 'io.netty:netty-tcnative-boringssl-static:2.0.65.Final' implementation 'io.netty:netty-tcnative-boringssl-static:2.0.65.Final'
implementation 'io.netty:netty-tcnative-classes:2.0.65.Final' implementation 'io.netty:netty-tcnative-classes:2.0.65.Final'
implementation 'io.netty:netty-transport-classes-epoll:4.1.108.Final' implementation 'io.netty:netty-transport-classes-epoll:4.1.110.Final'
implementation 'io.netty:netty-transport-classes-kqueue:4.1.108.Final' implementation 'io.netty:netty-transport-classes-kqueue:4.1.110.Final'
implementation 'io.netty:netty-transport-native-epoll:4.1.108.Final:linux-x86_64' implementation 'io.netty:netty-transport-native-epoll:4.1.110.Final:linux-x86_64'
implementation 'io.netty:netty-transport-native-kqueue:4.1.108.Final:osx-x86_64' implementation 'io.netty:netty-transport-native-kqueue:4.1.110.Final:osx-x86_64'
implementation 'io.netty:netty-transport-native-unix-common:4.1.108.Final' implementation 'io.netty:netty-transport-native-unix-common:4.1.110.Final'
implementation 'io.netty:netty-transport:4.1.108.Final' implementation 'io.netty:netty-transport:4.1.110.Final'
implementation 'io.projectreactor.netty:reactor-netty-core:1.0.43' implementation 'io.projectreactor.netty:reactor-netty-core:1.0.45'
implementation 'io.projectreactor.netty:reactor-netty-http:1.0.43' implementation 'io.projectreactor.netty:reactor-netty-http:1.0.45'
implementation 'io.projectreactor:reactor-core:3.4.36' implementation 'io.projectreactor:reactor-core:3.4.38'
implementation 'io.vavr:vavr:0.10.4' implementation 'io.vavr:vavr:0.10.4'
implementation 'io.vavr:vavr-match:0.10.4' implementation 'io.vavr:vavr-match:0.10.4'
implementation 'net.java.dev.jna:jna-platform:5.13.0' implementation 'net.java.dev.jna:jna-platform:5.13.0'
@ -116,16 +122,16 @@ task vendor {
String vendorPathPrefix = "vendor/jar-dependencies" String vendorPathPrefix = "vendor/jar-dependencies"
configurations.runtimeClasspath.allDependencies.each { dep -> configurations.runtimeClasspath.allDependencies.each { dep ->
println("Copying ${dep.group}:${dep.name}:${dep.version}") println("Copying ${dep.group}:${dep.name}:${dep.version}")
File f = configurations.runtimeClasspath.filter { it.absolutePath.contains("${dep.group}/${dep.name}/${dep.version}") }.singleFile File f = configurations.runtimeClasspath.filter { it.absolutePath.contains("${dep.group}${File.separator}${dep.name}${File.separator}${dep.version}") }.singleFile
String groupPath = dep.group.replaceAll('\\.', '/') String groupPath = dep.group.replaceAll('\\.', '/')
File newJarFile = file("${vendorPathPrefix}/${groupPath}/${dep.name}/${dep.version}/${dep.name}-${dep.version}.jar") File newJarFile = file("${vendorPathPrefix}${File.separator}${groupPath}${File.separator}${dep.name}${File.separator}${dep.version}${File.separator}${dep.name}-${dep.version}.jar")
newJarFile.mkdirs() newJarFile.mkdirs()
Files.copy(f.toPath(), newJarFile.toPath(), REPLACE_EXISTING) Files.copy(f.toPath(), newJarFile.toPath(), REPLACE_EXISTING)
} }
String projectGroupPath = project.group.replaceAll('\\.', '/') String projectGroupPath = project.group.replaceAll('\\.', '/')
File projectJarFile = file("${vendorPathPrefix}/${projectGroupPath}/${project.name}/${project.version}/${project.name}-${project.version}.jar") File projectJarFile = file("${vendorPathPrefix}${File.separator}${projectGroupPath}${File.separator}${project.name}${File.separator}${project.version}${File.separator}${project.name}-${project.version}.jar")
projectJarFile.mkdirs() projectJarFile.mkdirs()
Files.copy(file("$buildDir/libs/${project.name}-${project.version}.jar").toPath(), projectJarFile.toPath(), REPLACE_EXISTING) Files.copy(file("$buildDir${File.separator}libs${File.separator}${project.name}-${project.version}.jar").toPath(), projectJarFile.toPath(), REPLACE_EXISTING)
} }
} }
// The jar task is the standard packaging task & the generateGemJarRequiresFile task generates the ruby file with all the dependencies. // The jar task is the standard packaging task & the generateGemJarRequiresFile task generates the ruby file with all the dependencies.

2
version
Просмотреть файл

@ -1 +1 @@
2.0.7 2.0.8